From 218e38a9d8c27ee22c84d409eb8464de316f876d Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:13:31 +0200 Subject: [PATCH 01/14] fixed daily sec update --- .github/workflows/check_updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index 48490f13b..d87b6ebb4 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -18,6 +18,6 @@ jobs: echo "check_result=$check_result" >> $GITHUB_OUTPUT call_delploy: needs: [check_for_updates] - if: ${{ toJson(needs.check_for_updates.outputs.check_result == 'need to upgrade') }} + if: needs.check_for_updates.outputs.check_result == 'need to upgrade' uses: ./.github/workflows/starter.yaml secrets: inherit From bfeb3970829396b519b04b6dbc09919ac43755c7 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:15:14 +0200 Subject: [PATCH 02/14] fixed daily sec update --- .github/workflows/check_updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index d87b6ebb4..48490f13b 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -18,6 +18,6 @@ jobs: echo "check_result=$check_result" >> $GITHUB_OUTPUT call_delploy: needs: [check_for_updates] - if: needs.check_for_updates.outputs.check_result == 'need to upgrade' + if: ${{ toJson(needs.check_for_updates.outputs.check_result == 'need to upgrade') }} uses: ./.github/workflows/starter.yaml secrets: inherit From 116d8629dbdb3fcc17f54fcdd5c6abf19a012ef5 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:19:50 +0200 Subject: [PATCH 03/14] fixed daily sec update --- .github/workflows/check_updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index 48490f13b..763312241 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -12,7 +12,7 @@ jobs: steps: - name: check OpenAtlas container run: | - check_result="$(docker run --rm -u 0:0 --entrypoint /bin/bash ghcr.io/acdh-oeaw/openatlas/container-preview \ + check_result="$(docker run --rm -u 0:0 --entrypoint /bin/bash ghcr.io/acdh-oeaw/openatlas/container-preview:${{ github.ref_name }} \ -c 'apt-get update >/dev/null; if [ $(apt list --upgradable 2>/dev/null | wc -l) != 1 ]; then echo -n need to upgrade; else echo -n everything fine ; fi')" echo "$check_result" echo "check_result=$check_result" >> $GITHUB_OUTPUT From b8eb4eefbbe5bcf194c2c38ed1678fc98230d4f0 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:38:52 +0200 Subject: [PATCH 04/14] testing --- .github/workflows/check_updates.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index 763312241..d1e2c79b5 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -18,6 +18,12 @@ jobs: echo "check_result=$check_result" >> $GITHUB_OUTPUT call_delploy: needs: [check_for_updates] - if: ${{ toJson(needs.check_for_updates.outputs.check_result == 'need to upgrade') }} - uses: ./.github/workflows/starter.yaml - secrets: inherit + if: needs.check_for_updates.outputs.check_result == 'need to upgrade' + runs-on: ubuntu-latest + steps: + - name: check OpenAtlas container + run: | + echo "juhu" + + # uses: ./.github/workflows/starter.yaml + # secrets: inherit From bab27bd05b54add95d51d61e2b9b5166f1a524f4 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:40:51 +0200 Subject: [PATCH 05/14] testing --- .github/workflows/check_updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index d1e2c79b5..b71276241 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -18,7 +18,7 @@ jobs: echo "check_result=$check_result" >> $GITHUB_OUTPUT call_delploy: needs: [check_for_updates] - if: needs.check_for_updates.outputs.check_result == 'need to upgrade' + if: "! needs.check_for_updates.outputs.check_result == 'need to upgrade'" runs-on: ubuntu-latest steps: - name: check OpenAtlas container From 94b86c92e3b55c0b98ff1f9496cbc2936120e18e Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:42:07 +0200 Subject: [PATCH 06/14] testing --- .github/workflows/check_updates.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index b71276241..38b0f69a5 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -16,6 +16,7 @@ jobs: -c 'apt-get update >/dev/null; if [ $(apt list --upgradable 2>/dev/null | wc -l) != 1 ]; then echo -n need to upgrade; else echo -n everything fine ; fi')" echo "$check_result" echo "check_result=$check_result" >> $GITHUB_OUTPUT + echo "what" call_delploy: needs: [check_for_updates] if: "! needs.check_for_updates.outputs.check_result == 'need to upgrade'" From 7e777b7ee52effabeae401f19835f818e1bbe934 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:46:16 +0200 Subject: [PATCH 07/14] testing --- .github/workflows/check_updates.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index 38b0f69a5..e555849c7 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -16,10 +16,9 @@ jobs: -c 'apt-get update >/dev/null; if [ $(apt list --upgradable 2>/dev/null | wc -l) != 1 ]; then echo -n need to upgrade; else echo -n everything fine ; fi')" echo "$check_result" echo "check_result=$check_result" >> $GITHUB_OUTPUT - echo "what" call_delploy: needs: [check_for_updates] - if: "! needs.check_for_updates.outputs.check_result == 'need to upgrade'" + if: ${{ ! needs.check_for_updates.outputs.check_result == 'need to upgrade'}} runs-on: ubuntu-latest steps: - name: check OpenAtlas container From 8d03cc2cece922b9597a211ce8966d9b22bf4877 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:49:18 +0200 Subject: [PATCH 08/14] testing --- .github/workflows/check_updates.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index e555849c7..4aea2ccf4 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -18,12 +18,12 @@ jobs: echo "check_result=$check_result" >> $GITHUB_OUTPUT call_delploy: needs: [check_for_updates] - if: ${{ ! needs.check_for_updates.outputs.check_result == 'need to upgrade'}} + # if: ${{ ! needs.check_for_updates.outputs.check_result == 'need to upgrade'}} runs-on: ubuntu-latest steps: - name: check OpenAtlas container run: | - echo "juhu" + echo "${{ ! needs.check_for_updates.outputs.check_result == 'need to upgrade'}}" # uses: ./.github/workflows/starter.yaml # secrets: inherit From 1c2a1e8de76efa2dde86836b4f3d9c31f6a5f9e5 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:52:04 +0200 Subject: [PATCH 09/14] testing --- .github/workflows/check_updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index 4aea2ccf4..37a9a6307 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -23,7 +23,7 @@ jobs: steps: - name: check OpenAtlas container run: | - echo "${{ ! needs.check_for_updates.outputs.check_result == 'need to upgrade'}}" + echo "${{ needs.check_for_updates.outputs.check_result == 'need to upgrade'}}" # uses: ./.github/workflows/starter.yaml # secrets: inherit From 5d50a7d8a17cba94a3dba1c4cba4414d49cfd39f Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:52:29 +0200 Subject: [PATCH 10/14] testing --- .github/workflows/check_updates.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index 37a9a6307..b2a768f1b 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -23,6 +23,7 @@ jobs: steps: - name: check OpenAtlas container run: | + echo "${{ needs.check_for_updates.outputs.check_result }}" echo "${{ needs.check_for_updates.outputs.check_result == 'need to upgrade'}}" # uses: ./.github/workflows/starter.yaml From 48036f41184e596c901db31f211d9b22c856ac11 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:57:24 +0200 Subject: [PATCH 11/14] testing --- .github/workflows/check_updates.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index b2a768f1b..44c0af06b 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -9,8 +9,11 @@ on: jobs: check_for_updates: runs-on: ubuntu-latest + outputs: + check_result: ${{ steps.check_openatlas_container.outputs.check_result }} steps: - name: check OpenAtlas container + id: check_openatlas_container run: | check_result="$(docker run --rm -u 0:0 --entrypoint /bin/bash ghcr.io/acdh-oeaw/openatlas/container-preview:${{ github.ref_name }} \ -c 'apt-get update >/dev/null; if [ $(apt list --upgradable 2>/dev/null | wc -l) != 1 ]; then echo -n need to upgrade; else echo -n everything fine ; fi')" From 49b43b9f9c7209623395826372f515fe8a885af6 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 16:59:10 +0200 Subject: [PATCH 12/14] fixing --- .github/workflows/check_updates.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index 44c0af06b..a1dabdeac 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -21,13 +21,6 @@ jobs: echo "check_result=$check_result" >> $GITHUB_OUTPUT call_delploy: needs: [check_for_updates] - # if: ${{ ! needs.check_for_updates.outputs.check_result == 'need to upgrade'}} - runs-on: ubuntu-latest - steps: - - name: check OpenAtlas container - run: | - echo "${{ needs.check_for_updates.outputs.check_result }}" - echo "${{ needs.check_for_updates.outputs.check_result == 'need to upgrade'}}" - - # uses: ./.github/workflows/starter.yaml - # secrets: inherit + if: ${{ ! needs.check_for_updates.outputs.check_result == 'need to upgrade'}} + uses: ./.github/workflows/starter.yaml + secrets: inherit From 538c74deb36a5d0c6e1f3d70a05c417af324c38e Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 17:00:18 +0200 Subject: [PATCH 13/14] fixing --- .github/workflows/check_updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index a1dabdeac..2c742d90e 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -21,6 +21,6 @@ jobs: echo "check_result=$check_result" >> $GITHUB_OUTPUT call_delploy: needs: [check_for_updates] - if: ${{ ! needs.check_for_updates.outputs.check_result == 'need to upgrade'}} + if: ${{ needs.check_for_updates.outputs.check_result == 'need to upgrade'}} uses: ./.github/workflows/starter.yaml secrets: inherit From 7ebe17a2586be217b24a7e3dcab6b25b25bf30f9 Mon Sep 17 00:00:00 2001 From: bkoschicek Date: Wed, 18 Oct 2023 17:03:43 +0200 Subject: [PATCH 14/14] fixing --- .github/workflows/check_updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_updates.yml b/.github/workflows/check_updates.yml index 2c742d90e..1af0e980e 100644 --- a/.github/workflows/check_updates.yml +++ b/.github/workflows/check_updates.yml @@ -21,6 +21,6 @@ jobs: echo "check_result=$check_result" >> $GITHUB_OUTPUT call_delploy: needs: [check_for_updates] - if: ${{ needs.check_for_updates.outputs.check_result == 'need to upgrade'}} + if: needs.check_for_updates.outputs.check_result == 'need to upgrade' uses: ./.github/workflows/starter.yaml secrets: inherit