From a55c3767301fd92c3ddb08b06bc29ac74fbf3167 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 15 Aug 2024 11:48:55 +0200 Subject: [PATCH 1/4] Lumi CI: push as a branch --- .github/workflows/gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml index 2a46e8557..edcf4e693 100644 --- a/.github/workflows/gitlab-ci.yml +++ b/.github/workflows/gitlab-ci.yml @@ -130,8 +130,7 @@ jobs: rev-id: ${{ github.sha }} rev-signing-format: ssh rev-signing-key: ${{ secrets.GITLAB_SIGNING_KEY }} - ref-type: tag - ref-message: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + ref-type: branch force-push: true # # Create GitLab CI/CD Pipeline @@ -194,6 +193,6 @@ jobs: server-url: ${{ vars.GITLAB_SERVER }} project-name: ${{ vars.GITLAB_PROJECT }} token: ${{ secrets.GITLAB_TOKEN }} - ref-type: tag + ref-type: branch ref-name: ${{ needs.lumi-init.outputs.ref-name }} force: true From dfd147785c697a4cb3846afd8b92cde3eed1be83 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 15 Aug 2024 12:50:03 +0200 Subject: [PATCH 2/4] GitLab CI: do not duplicate reference types --- .github/workflows/gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml index edcf4e693..8090d1ac5 100644 --- a/.github/workflows/gitlab-ci.yml +++ b/.github/workflows/gitlab-ci.yml @@ -25,6 +25,7 @@ jobs: github.event.pull_request.user.login != 'dependabot[bot]' )) runs-on: ubuntu-latest outputs: + ref-type: ${{ steps.g-push-rev.outputs.ref-type }} ref-name: ${{ steps.g-push-rev.outputs.ref-name }} pipeline-id: ${{ steps.gl-trigger-pipeline.outputs.pipeline-id }} steps: @@ -94,7 +95,7 @@ jobs: with: remote-url: ${{ vars.DKRZ_GITLAB_SERVER }}/${{ vars.DKRZ_GITLAB_PROJECT }}.git password: ${{ secrets.DKRZ_GITLAB_TOKEN }} - ref-type: tag + ref-type: ${{ needs.levante-init.outputs.ref-type }} ref-name: ${{ needs.levante-init.outputs.ref-name }} force: true # @@ -108,6 +109,7 @@ jobs: github.event.pull_request.user.login != 'dependabot[bot]' )) runs-on: ubuntu-latest outputs: + ref-type: ${{ steps.g-push-rev.outputs.ref-type }} ref-name: ${{ steps.g-push-rev.outputs.ref-name }} pipeline-id: ${{ steps.gl-create-pipeline.outputs.pipeline-id }} steps: @@ -193,6 +195,6 @@ jobs: server-url: ${{ vars.GITLAB_SERVER }} project-name: ${{ vars.GITLAB_PROJECT }} token: ${{ secrets.GITLAB_TOKEN }} - ref-type: branch + ref-type: ${{ needs.lumi-init.outputs.ref-type }} ref-name: ${{ needs.lumi-init.outputs.ref-name }} force: true From 15062877c5077be25aded96ef91e12ed4ead0f0b Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 15 Aug 2024 13:10:16 +0200 Subject: [PATCH 3/4] Lumi CI: do not fail the clean-up if the pipeline is missing --- .github/workflows/gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml index 8090d1ac5..f079e1333 100644 --- a/.github/workflows/gitlab-ci.yml +++ b/.github/workflows/gitlab-ci.yml @@ -190,6 +190,7 @@ jobs: project-name: ${{ vars.GITLAB_PROJECT }} token: ${{ secrets.GITLAB_TOKEN }} pipeline-id: ${{ needs.lumi-init.outputs.pipeline-id }} + force: true - uses: "skosukhin/git-ci-hub-lab/gl-delete-ref@v1" with: server-url: ${{ vars.GITLAB_SERVER }} From 19c384f6c98cd61a1d724174bf6e76a37f973c68 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 15 Aug 2024 14:29:24 +0200 Subject: [PATCH 4/4] Self-hosted CI: a workaround for the old runtime on Daint --- .github/workflows/self-hosted-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/self-hosted-ci.yml b/.github/workflows/self-hosted-ci.yml index 7077eda6f..8f1953115 100644 --- a/.github/workflows/self-hosted-ci.yml +++ b/.github/workflows/self-hosted-ci.yml @@ -13,6 +13,10 @@ defaults: run: shell: bash +# A workaround for the old runtime: +env: + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true + jobs: CI: if: github.repository == 'earth-system-radiation/rte-rrtmgp'