From b4f5358237d4462d0c36423b7f303fc50de2212a Mon Sep 17 00:00:00 2001 From: Dan Lapteacru Date: Mon, 13 May 2024 12:19:49 +0300 Subject: [PATCH 1/4] Add LOCAL_PATH for trellis deploy --- .github/workflows/trellis-deploy-radicle.yml | 8 +- .idea/php.xml | 19 +++ .idea/vcs.xml | 6 + .idea/workspace.xml | 116 +++++++++++++++++++ 4 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.github/workflows/trellis-deploy-radicle.yml b/.github/workflows/trellis-deploy-radicle.yml index 8d682f6..20de98f 100644 --- a/.github/workflows/trellis-deploy-radicle.yml +++ b/.github/workflows/trellis-deploy-radicle.yml @@ -21,6 +21,10 @@ on: type: string default: "site/web/app/themes/${{ inputs.THEME_NAME }}" required: false + LOCAL_PATH: + type: string + default: "bedrock" + required: false TRELLIS_ENVIRONMENT: type: string required: true @@ -68,7 +72,7 @@ jobs: - name: Checkout Site uses: actions/checkout@v4 with: - path: site + path: ${{ inputs.LOCAL_PATH }} - name: Setup Node ${{ inputs.NODE_VERSION }} uses: actions/setup-node@v4 @@ -118,6 +122,6 @@ jobs: - name: Cache deployed commit hash run: gh variable set LAST_DEPLOY --body='${{ github.sha }}' - working-directory: site + working-directory: ${{ inputs.LOCAL_PATH }} env: GITHUB_TOKEN: ${{ secrets.REPO_PAT }} diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..f324872 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..b8c043f --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + { + "lastFilter": { + "state": "OPEN", + "assignee": "danlapteacru" + } +} + + + + { + "selectedUrlAndAccountId": { + "url": "git@github.com:ItinerisLtd/.github.git", + "accountId": "eae839db-127a-4ff8-b2db-32ce49478ba1" + } +} + + { + "associatedIndex": 5 +} + + + + + + + + + + + + + + + + + + + + 1715253406692 + + + + + + \ No newline at end of file From 6b36bf5cb9dc7c19957122ab138c1b5b39f22d6f Mon Sep 17 00:00:00 2001 From: Dan Lapteacru Date: Mon, 13 May 2024 12:20:00 +0300 Subject: [PATCH 2/4] remove .idea --- .idea/php.xml | 19 -------- .idea/vcs.xml | 6 --- .idea/workspace.xml | 116 -------------------------------------------- 3 files changed, 141 deletions(-) delete mode 100644 .idea/php.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index f324872..0000000 --- a/.idea/php.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index b8c043f..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - { - "lastFilter": { - "state": "OPEN", - "assignee": "danlapteacru" - } -} - - - - { - "selectedUrlAndAccountId": { - "url": "git@github.com:ItinerisLtd/.github.git", - "accountId": "eae839db-127a-4ff8-b2db-32ce49478ba1" - } -} - - { - "associatedIndex": 5 -} - - - - - - - - - - - - - - - - - - - - 1715253406692 - - - - - - \ No newline at end of file From 6dee6e76b198051689527699cd975a3b40c5a7ee Mon Sep 17 00:00:00 2001 From: Dan Lapteacru Date: Mon, 13 May 2024 12:45:06 +0300 Subject: [PATCH 3/4] Delete conditional logic for setup node job --- .github/workflows/trellis-deploy-radicle.yml | 1 - .idea/workspace.xml | 122 +++++++++++++++++++ 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml diff --git a/.github/workflows/trellis-deploy-radicle.yml b/.github/workflows/trellis-deploy-radicle.yml index 20de98f..9f30399 100644 --- a/.github/workflows/trellis-deploy-radicle.yml +++ b/.github/workflows/trellis-deploy-radicle.yml @@ -76,7 +76,6 @@ jobs: - name: Setup Node ${{ inputs.NODE_VERSION }} uses: actions/setup-node@v4 - if: "${{ inputs.THEME_NAME != '' }}" with: node-version: "${{ inputs.NODE_VERSION }}" cache: yarn diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..312a2f8 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + { + "lastFilter": { + "state": "OPEN", + "assignee": "danlapteacru" + } +} + + + + { + "selectedUrlAndAccountId": { + "url": "git@github.com:ItinerisLtd/.github.git", + "accountId": "eae839db-127a-4ff8-b2db-32ce49478ba1" + } +} + + { + "associatedIndex": 5 +} + + + + + + + + + + + + + + + + + + + + 1715253406692 + + + + + + \ No newline at end of file From 5ccc0b6caed444a9dd41f0b869708c86e784fbac Mon Sep 17 00:00:00 2001 From: Dan Lapteacru Date: Mon, 13 May 2024 12:45:17 +0300 Subject: [PATCH 4/4] remove .idea --- .idea/workspace.xml | 122 -------------------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 312a2f8..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - { - "lastFilter": { - "state": "OPEN", - "assignee": "danlapteacru" - } -} - - - - { - "selectedUrlAndAccountId": { - "url": "git@github.com:ItinerisLtd/.github.git", - "accountId": "eae839db-127a-4ff8-b2db-32ce49478ba1" - } -} - - { - "associatedIndex": 5 -} - - - - - - - - - - - - - - - - - - - - 1715253406692 - - - - - - \ No newline at end of file