From 23c5933e10e81773ecc2f077877fb5f754ad8540 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Wed, 6 Dec 2023 13:53:58 +1100 Subject: [PATCH 01/18] Add build job --- .github/workflows/build.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..91f355c2e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,35 @@ +name: build + +on: push + +jobs: + set_status_in_progress: + name: set_status_in_progress + if: always() + uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main + secrets: inherit + with: + context: 'tide_build' + description: 'Tide Build running...' + state: 'pending' + target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }} + tide_build: + name: tide_build + secrets: inherit + uses: dpc-sdp/github-actions/.github/workflows/tide_build.yml@feature/DDS-1510-tide-module-builds + with: + install_dev_tools: true + export_config: + name: export_config + secrets: inherit + uses: dpc-sdp/github-actions/.github/workflows/export_config.yml@main + set_status: + name: set_status + needs: [tide_build] + if: always() + uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main + secrets: inherit + with: + context: 'tide_build' + description: 'Tide Build' + target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }} From c843880123efd9e4b0a521d47100ac36c844ad4d Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Wed, 6 Dec 2023 14:51:44 +1100 Subject: [PATCH 02/18] Add merge to reference job for Tide modules --- .github/workflows/merge_to_reference.yml | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/merge_to_reference.yml diff --git a/.github/workflows/merge_to_reference.yml b/.github/workflows/merge_to_reference.yml new file mode 100644 index 000000000..63c03f179 --- /dev/null +++ b/.github/workflows/merge_to_reference.yml @@ -0,0 +1,31 @@ +name: merge_to_reference + +on: + push: + branches: + - develop + +jobs: + set_status_in_progress: + name: set_status_in_progress + if: always() + uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main + secrets: inherit + with: + context: 'tide_merge_to_reference' + description: 'Merge to reference running...' + state: 'pending' + target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }} + tide_merge_to_reference: + name: tide_merge_to_reference + uses: dpc-sdp/github-actions/.github/workflows/tide_merge_to_reference.yml@feature/DDS-1510-tide-module-builds + set_status: + name: set_status + needs: [tide_build] + if: always() + uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main + secrets: inherit + with: + context: 'tide_merge_to_reference' + description: 'Merge to reference running...' + target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }} From 7f553a2e1c9b84984e17aaf9ce5c0aaed73fe46f Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 09:31:14 +1100 Subject: [PATCH 03/18] Update runner name --- .github/workflows/build.yml | 1 + .github/workflows/merge_to_reference.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91f355c2e..1abe814a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: uses: dpc-sdp/github-actions/.github/workflows/tide_build.yml@feature/DDS-1510-tide-module-builds with: install_dev_tools: true + runner: biggy-tide export_config: name: export_config secrets: inherit diff --git a/.github/workflows/merge_to_reference.yml b/.github/workflows/merge_to_reference.yml index 63c03f179..1e766a142 100644 --- a/.github/workflows/merge_to_reference.yml +++ b/.github/workflows/merge_to_reference.yml @@ -21,7 +21,7 @@ jobs: uses: dpc-sdp/github-actions/.github/workflows/tide_merge_to_reference.yml@feature/DDS-1510-tide-module-builds set_status: name: set_status - needs: [tide_build] + needs: [tide_merge_to_reference] if: always() uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main secrets: inherit From 5033b815041e1be85d18cca7a924c0db5d026b08 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 09:45:49 +1100 Subject: [PATCH 04/18] Use module_build var --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1abe814a5..b825aa4e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: secrets: inherit uses: dpc-sdp/github-actions/.github/workflows/tide_build.yml@feature/DDS-1510-tide-module-builds with: - install_dev_tools: true + module_build: true runner: biggy-tide export_config: name: export_config From 681f7f13036bf5290b6e9e58adcb5590434f2861 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 12:03:11 +1100 Subject: [PATCH 05/18] Add sync workflow --- .github/workflows/dorg_git_sync.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/dorg_git_sync.yml diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml new file mode 100644 index 000000000..dfbcfd988 --- /dev/null +++ b/.github/workflows/dorg_git_sync.yml @@ -0,0 +1,19 @@ +name: dorg_git_sync + +on: push + +jobs: + dorg_git_sync: + name: dorg_git_sync + runs-on: ubuntu-latest + container: + image: ghcr.io/dpc-sdp/bay/ci-builder:5.x + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Configure Drupal.org remote + run: | + git remote add dorg git@git.drupal.org:project/tide_core.git + - name: Push the current branch to the Drupal.org remote + run: | + git push dorg HEAD \ No newline at end of file From 0047794617d4eaf8583cdac37e69fea745ed0e6a Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 13:09:55 +1100 Subject: [PATCH 06/18] Install SSH key --- .github/workflows/dorg_git_sync.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index dfbcfd988..7e84d8cbf 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -9,6 +9,12 @@ jobs: container: image: ghcr.io/dpc-sdp/bay/ci-builder:5.x steps: + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_PRIVATE_KEY }} + name: id_rsa + if_key_exists: fail - name: Checkout code uses: actions/checkout@v4 - name: Configure Drupal.org remote From d6b06abbdc5382a601b0fbac0edd0954bbf21a90 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 13:16:12 +1100 Subject: [PATCH 07/18] Add git.drupal.org to KNOWN_HOSTS --- .github/workflows/dorg_git_sync.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index 7e84d8cbf..bb61cd784 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -14,6 +14,10 @@ jobs: with: key: ${{ secrets.SSH_PRIVATE_KEY }} name: id_rsa + known_hosts: + git.drupal.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCkFTXM7BUQUHlDkVmQV6qNkIeSIRBTNzlLn+T/APHa + git.drupal.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEyYM2eEQJJLgBxDmCMHykxAkTLMryXJ2zHeQWMFaRCweHmivtuNRzvEfiir09IMwtC+1gP1Tu9tlkqXqtMrWl8= + git.drupal.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbjTZ+rsrZ82kHqPBFfRxP/JJJWrpAaOGGS5Qj6ewK3gQt/ENa47e/rqAjvm8aSvm0GAhjbMmgKQA95USTRqT/VmNmX9NsGzvG1FV9PZ2q6ejoeAkT6PAOF+ZNrG1nNx4ly9h3mYocNgEx6GhqQHznzwXHqK82ZEtXNBVjd+i+sCbz54udQTUZH+KV/yeqYDKsYYA9o+R8ULPTF89bqCaTEy6NyP4d+mv+nqt8ztSWLph8mjol6Cr/LpNtM2Xijr8KmeJ9cEjOW2Tj3v2pyAHhBtLRtL8UgQGRUcOgMgj8fZHAFOhK36n9Esv+i7sFfALy1v0DdLObk8ixWc5eZF1x if_key_exists: fail - name: Checkout code uses: actions/checkout@v4 From 7392d8ae3e3c85d43541286aa55917e8292a45ef Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 13:26:42 +1100 Subject: [PATCH 08/18] Remove container --- .github/workflows/dorg_git_sync.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index bb61cd784..3cc83cd93 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -6,8 +6,6 @@ jobs: dorg_git_sync: name: dorg_git_sync runs-on: ubuntu-latest - container: - image: ghcr.io/dpc-sdp/bay/ci-builder:5.x steps: - name: Install SSH key uses: shimataro/ssh-key-action@v2 From 84548eb8e3f1df34f21661275808fcc58b49d9b9 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 13:46:03 +1100 Subject: [PATCH 09/18] Perform unshallow clone --- .github/workflows/dorg_git_sync.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index 3cc83cd93..d74a828b4 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -19,6 +19,9 @@ jobs: if_key_exists: fail - name: Checkout code uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true - name: Configure Drupal.org remote run: | git remote add dorg git@git.drupal.org:project/tide_core.git From 947bdb3d41ea43b54f3ff08df1c0e9dc8ad200f9 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 14:06:13 +1100 Subject: [PATCH 10/18] Push tags --- .github/workflows/dorg_git_sync.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index d74a828b4..bd39fc07d 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -27,4 +27,5 @@ jobs: git remote add dorg git@git.drupal.org:project/tide_core.git - name: Push the current branch to the Drupal.org remote run: | - git push dorg HEAD \ No newline at end of file + git push dorg HEAD + git push --tags \ No newline at end of file From b2710f99e66cb294fa8dd5351ff28c857e3a1357 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 14:09:06 +1100 Subject: [PATCH 11/18] Fix push tags --- .github/workflows/dorg_git_sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index bd39fc07d..9aa267e25 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -28,4 +28,4 @@ jobs: - name: Push the current branch to the Drupal.org remote run: | git push dorg HEAD - git push --tags \ No newline at end of file + git push dorg --tags \ No newline at end of file From 6b23217b9a2ded1314bf03c60db3dd2f82a56845 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 14:40:04 +1100 Subject: [PATCH 12/18] Switch to reusable workflow for git sync --- .github/workflows/dorg_git_sync.yml | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index 9aa267e25..56804a4cf 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -5,27 +5,7 @@ on: push jobs: dorg_git_sync: name: dorg_git_sync - runs-on: ubuntu-latest - steps: - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_PRIVATE_KEY }} - name: id_rsa - known_hosts: - git.drupal.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCkFTXM7BUQUHlDkVmQV6qNkIeSIRBTNzlLn+T/APHa - git.drupal.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEyYM2eEQJJLgBxDmCMHykxAkTLMryXJ2zHeQWMFaRCweHmivtuNRzvEfiir09IMwtC+1gP1Tu9tlkqXqtMrWl8= - git.drupal.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbjTZ+rsrZ82kHqPBFfRxP/JJJWrpAaOGGS5Qj6ewK3gQt/ENa47e/rqAjvm8aSvm0GAhjbMmgKQA95USTRqT/VmNmX9NsGzvG1FV9PZ2q6ejoeAkT6PAOF+ZNrG1nNx4ly9h3mYocNgEx6GhqQHznzwXHqK82ZEtXNBVjd+i+sCbz54udQTUZH+KV/yeqYDKsYYA9o+R8ULPTF89bqCaTEy6NyP4d+mv+nqt8ztSWLph8mjol6Cr/LpNtM2Xijr8KmeJ9cEjOW2Tj3v2pyAHhBtLRtL8UgQGRUcOgMgj8fZHAFOhK36n9Esv+i7sFfALy1v0DdLObk8ixWc5eZF1x - if_key_exists: fail - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - fetch-tags: true - - name: Configure Drupal.org remote - run: | - git remote add dorg git@git.drupal.org:project/tide_core.git - - name: Push the current branch to the Drupal.org remote - run: | - git push dorg HEAD - git push dorg --tags \ No newline at end of file + uses: dpc-sdp/github-actions/.github/workflows/dorg_git_sync.yml@feature/DDS-1510-tide-module-builds + secrets: inherit + with: + project: ${GITHUB_REPOSITORY#*/} \ No newline at end of file From cfc39099bb095f2dc792c4a029e5f1cebe704bb3 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 14:53:43 +1100 Subject: [PATCH 13/18] Remove param --- .github/workflows/dorg_git_sync.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index 56804a4cf..d2a8f2038 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -6,6 +6,4 @@ jobs: dorg_git_sync: name: dorg_git_sync uses: dpc-sdp/github-actions/.github/workflows/dorg_git_sync.yml@feature/DDS-1510-tide-module-builds - secrets: inherit - with: - project: ${GITHUB_REPOSITORY#*/} \ No newline at end of file + secrets: inherit \ No newline at end of file From fbbcd8b80d9b3e5a9fe75dccd48356c8a997fed6 Mon Sep 17 00:00:00 2001 From: Ming Quah Date: Thu, 7 Dec 2023 15:23:32 +1100 Subject: [PATCH 14/18] Temporarily revert --- .github/workflows/dorg_git_sync.yml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index d2a8f2038..9aa267e25 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -5,5 +5,27 @@ on: push jobs: dorg_git_sync: name: dorg_git_sync - uses: dpc-sdp/github-actions/.github/workflows/dorg_git_sync.yml@feature/DDS-1510-tide-module-builds - secrets: inherit \ No newline at end of file + runs-on: ubuntu-latest + steps: + - name: Install SSH key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_PRIVATE_KEY }} + name: id_rsa + known_hosts: + git.drupal.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCkFTXM7BUQUHlDkVmQV6qNkIeSIRBTNzlLn+T/APHa + git.drupal.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEyYM2eEQJJLgBxDmCMHykxAkTLMryXJ2zHeQWMFaRCweHmivtuNRzvEfiir09IMwtC+1gP1Tu9tlkqXqtMrWl8= + git.drupal.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbjTZ+rsrZ82kHqPBFfRxP/JJJWrpAaOGGS5Qj6ewK3gQt/ENa47e/rqAjvm8aSvm0GAhjbMmgKQA95USTRqT/VmNmX9NsGzvG1FV9PZ2q6ejoeAkT6PAOF+ZNrG1nNx4ly9h3mYocNgEx6GhqQHznzwXHqK82ZEtXNBVjd+i+sCbz54udQTUZH+KV/yeqYDKsYYA9o+R8ULPTF89bqCaTEy6NyP4d+mv+nqt8ztSWLph8mjol6Cr/LpNtM2Xijr8KmeJ9cEjOW2Tj3v2pyAHhBtLRtL8UgQGRUcOgMgj8fZHAFOhK36n9Esv+i7sFfALy1v0DdLObk8ixWc5eZF1x + if_key_exists: fail + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true + - name: Configure Drupal.org remote + run: | + git remote add dorg git@git.drupal.org:project/tide_core.git + - name: Push the current branch to the Drupal.org remote + run: | + git push dorg HEAD + git push dorg --tags \ No newline at end of file From 8759bfa673723b88474072d9b50e9e4cdc1e8a99 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 7 Dec 2023 16:01:43 +1100 Subject: [PATCH 15/18] debug --- .github/workflows/dorg_git_sync.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index 9aa267e25..8b60f6838 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -7,6 +7,8 @@ jobs: name: dorg_git_sync runs-on: ubuntu-latest steps: + - name: debug + run: echo ${{ secrets.SSH_PRIVATE_KEY }} - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: @@ -28,4 +30,4 @@ jobs: - name: Push the current branch to the Drupal.org remote run: | git push dorg HEAD - git push dorg --tags \ No newline at end of file + git push dorg --tags From 63b5b3ef652dfffd1f23d81887ccd2855371759b Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 7 Dec 2023 16:05:36 +1100 Subject: [PATCH 16/18] debug --- .github/workflows/dorg_git_sync.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index 8b60f6838..389b191a8 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -8,7 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - name: debug - run: echo ${{ secrets.SSH_PRIVATE_KEY }} + run: | + echo '${{ secrets.SSH_PRIVATE_KEY }}' > /tmp/test; + cat /tmp/test | rev - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: From 711d12380bbb5a77f6455b109a349b6098efae4f Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 7 Dec 2023 16:14:24 +1100 Subject: [PATCH 17/18] debug --- .github/workflows/dorg_git_sync.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index 389b191a8..4524d62d4 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -33,3 +33,4 @@ jobs: run: | git push dorg HEAD git push dorg --tags + From dde1894f07b2b437bd4373483857e42c89c2b14e Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 7 Dec 2023 16:19:59 +1100 Subject: [PATCH 18/18] debug --- .github/workflows/dorg_git_sync.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml index 4524d62d4..389b191a8 100644 --- a/.github/workflows/dorg_git_sync.yml +++ b/.github/workflows/dorg_git_sync.yml @@ -33,4 +33,3 @@ jobs: run: | git push dorg HEAD git push dorg --tags -