From 6685a94d228614239d492ded219ab2f081923f02 Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Thu, 15 Aug 2024 14:49:41 +0200
Subject: [PATCH] Fixes for CI (#294)

* Lumi CI: push as a branch, do not fail the clean-up if the pipeline is missing
* GitLab CI: do not duplicate reference types
* Self-hosted CI: a workaround for the old runtime on Daint
---
 .github/workflows/gitlab-ci.yml      | 10 ++++++----
 .github/workflows/self-hosted-ci.yml |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gitlab-ci.yml b/.github/workflows/gitlab-ci.yml
index 2a46e8557..f079e1333 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:
@@ -130,8 +132,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
@@ -189,11 +190,12 @@ 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 }}
         project-name: ${{ vars.GITLAB_PROJECT }}
         token: ${{ secrets.GITLAB_TOKEN }}
-        ref-type: tag
+        ref-type: ${{ needs.lumi-init.outputs.ref-type }}
         ref-name: ${{ needs.lumi-init.outputs.ref-name }}
         force: true
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'