Skip to content

Commit

Permalink
Fixes for CI (#294)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
skosukhin authored Aug 15, 2024
1 parent 9660d18 commit 6685a94
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
#
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
4 changes: 4 additions & 0 deletions .github/workflows/self-hosted-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 6685a94

Please sign in to comment.