Skip to content

Commit

Permalink
fix(ci): use sha rather than branch for "wait-on" action (#1150)
Browse files Browse the repository at this point in the history
  • Loading branch information
corneliusroemer authored Feb 26, 2024
1 parent fdc00dd commit 33b7453
Showing 1 changed file with 45 additions and 45 deletions.
90 changes: 45 additions & 45 deletions .github/workflows/update-argocd-metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Update argocd_metadata
on:
push:
branches:
- main
- main

jobs:
update:
Expand All @@ -14,47 +14,47 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout Main Repository
uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Get SHA - length 7
id: get_sha
run: |
echo "sha=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_OUTPUT
- name: Wait for Backend Docker Image
uses: lewagon/wait-on-check-action@v1.3.3
with:
ref: ${{ github.ref }}
check-name: Build Backend Docker Image
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Wait for Website Docker Image
uses: lewagon/wait-on-check-action@v1.3.3
with:
ref: ${{ github.ref }}
check-name: Build Website Docker Image
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout External Repository
uses: actions/checkout@v4
with:
repository: 'loculus-project/argocd_metadata'
token: ${{ secrets.ARGOCD_METADATA_PAT }}

- name: Modify config.json
run: |
echo '{
"branch" : "main",
"number" : 999,
"head_short_sha_7": "${{ steps.get_sha.outputs.sha }}"
}' > config.json
- name: Commit and Push Changes
run: |
git config --global user.name 'Loculus bot'
git config --global user.email 'bot@loculus.org'
git add config.json
git commit -m "Update config.json"
git push --force
- name: Checkout Main Repository
uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Get SHA - length 7
id: get_sha
run: |
echo "sha=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_OUTPUT
- name: Wait for Backend Docker Image
uses: lewagon/wait-on-check-action@v1.3.3
with:
ref: ${{ github.sha }}
check-name: Build Backend Docker Image
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Wait for Website Docker Image
uses: lewagon/wait-on-check-action@v1.3.3
with:
ref: ${{ github.sha }}
check-name: Build Website Docker Image
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout External Repository
uses: actions/checkout@v4
with:
repository: "loculus-project/argocd_metadata"
token: ${{ secrets.ARGOCD_METADATA_PAT }}

- name: Modify config.json
run: |
echo '{
"branch" : "main",
"number" : 999,
"head_short_sha_7": "${{ steps.get_sha.outputs.sha }}"
}' > config.json
- name: Commit and Push Changes
run: |
git config --global user.name 'Loculus bot'
git config --global user.email 'bot@loculus.org'
git add config.json
git commit -m "Update config.json"
git push --force

0 comments on commit 33b7453

Please sign in to comment.