Merge pull request #2910 from regro/fix-jobs

fix: container tag is busted in pull
regro · Aug 5, 2024 · 2c70b3b · 2c70b3b
2 parents aa5ff4f + 09df60e
commit 2c70b3b
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 12 deletions.
diff --git a/.github/workflows/bot-bot.yml b/.github/workflows/bot-bot.yml
@@ -7,6 +7,9 @@ on:
 
 concurrency: bot-v2
 
+env:
+  CF_TICK_CONTAINER_TAG: latest
+
 jobs:
   bot:
     name: bot
@@ -54,7 +57,6 @@ jobs:
           MEMORY_LIMIT_GB: 7
           CF_TICK_GRAPH_DATA_BACKENDS: "${{ vars.CF_TICK_GRAPH_DATA_BACKENDS }}"
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: status of changes
         if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP

diff --git a/.github/workflows/bot-cache.yml b/.github/workflows/bot-cache.yml
@@ -7,6 +7,9 @@ on:
 
 concurrency: bot-cache
 
+env:
+  CF_TICK_CONTAINER_TAG: latest
+
 jobs:
   bot-cache:
     name: bot-cache
@@ -62,7 +65,6 @@ jobs:
         env:
           CF_TICK_GRAPH_DATA_BACKENDS: "${{ vars.CF_TICK_GRAPH_DATA_BACKENDS }}"
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
-          CF_TICK_CONTAINER_TAG: latest
 
   bot-cache-trigger:
     needs: bot-cache

diff --git a/.github/workflows/bot-make-graph.yml b/.github/workflows/bot-make-graph.yml
@@ -7,6 +7,9 @@ on:
 
 concurrency: bot-make-graph
 
+env:
+  CF_TICK_CONTAINER_TAG: latest
+
 jobs:
   update-nodes:
     name: update-nodes
@@ -51,7 +54,6 @@ jobs:
           CF_TICK_GRAPH_DATA_BACKENDS: "${{ vars.CF_TICK_GRAPH_DATA_BACKENDS }}"
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
           BOT_JOB: ${{ matrix.job_num }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: deploy
         if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP
@@ -114,7 +116,6 @@ jobs:
         env:
           CF_TICK_GRAPH_DATA_BACKENDS: "${{ vars.CF_TICK_GRAPH_DATA_BACKENDS }}"
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: deploy
         if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP

diff --git a/.github/workflows/bot-make-migrators.yml b/.github/workflows/bot-make-migrators.yml
@@ -7,6 +7,9 @@ on:
 
 concurrency: bot-make-migrators
 
+env:
+  CF_TICK_CONTAINER_TAG: latest
+
 jobs:
   make-migrators:
     name: make-migrators
@@ -47,7 +50,6 @@ jobs:
         env:
           CF_TICK_GRAPH_DATA_BACKENDS: "${{ vars.CF_TICK_GRAPH_DATA_BACKENDS }}"
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: deploy
         if: github.ref == 'refs/heads/master' && always() && ! env.CI_SKIP

diff --git a/.github/workflows/bot-prs.yml b/.github/workflows/bot-prs.yml
@@ -7,6 +7,9 @@ on:
 
 concurrency: prs
 
+env:
+  CF_TICK_CONTAINER_TAG: latest
+
 jobs:
   prs:
     name: prs
@@ -54,7 +57,6 @@ jobs:
           BOT_JOB: ${{ matrix.job_num }}
           CF_TICK_GRAPH_DATA_BACKENDS: "${{ vars.CF_TICK_GRAPH_DATA_BACKENDS }}"
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: deploy
         if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP

diff --git a/.github/workflows/bot-pypi-mapping.yml b/.github/workflows/bot-pypi-mapping.yml
@@ -5,11 +5,15 @@ on:
     - cron: '42 * * * *'
   workflow_dispatch: null
 
+concurrency: bot-pypi-mapping
+
+env:
+  CF_TICK_CONTAINER_TAG: latest
+
 jobs:
   pypi-mapping:
     name: pypi-mapping
     runs-on: "ubuntu-latest"
-    concurrency: pypi-mapping
     defaults:
       run:
         shell: bash -leo pipefail {0}
@@ -45,7 +49,6 @@ jobs:
           conda-forge-tick make-import-to-package-mapping
         env:
           BOT_TOKEN: ${{ secrets.AUTOTICK_BOT_TOKEN }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: build pypi mapping
         if: success() && ! env.CI_SKIP
@@ -55,7 +58,6 @@ jobs:
           conda-forge-tick make-mappings
         env:
           BOT_TOKEN: ${{ secrets.AUTOTICK_BOT_TOKEN }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: deploy
         if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP

diff --git a/.github/workflows/bot-update-status-page.yml b/.github/workflows/bot-update-status-page.yml
@@ -5,6 +5,9 @@ on:
 
 concurrency: update-status-page
 
+env:
+  CF_TICK_CONTAINER_TAG: latest
+
 jobs:
   update_status_page:
     name: update-status-page
@@ -43,7 +46,6 @@ jobs:
           conda-forge-tick make-status-report
         env:
           BOT_TOKEN: ${{ secrets.AUTOTICK_BOT_TOKEN }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: deploy
         if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP

diff --git a/.github/workflows/bot-versions.yml b/.github/workflows/bot-versions.yml
@@ -7,6 +7,9 @@ on:
 
 concurrency: versions
 
+env:
+  CF_TICK_CONTAINER_TAG: latest
+
 jobs:
   versions:
     name: versions
@@ -51,7 +54,6 @@ jobs:
           BOT_JOB: ${{ matrix.job_num }}
           CF_TICK_GRAPH_DATA_BACKENDS: "${{ vars.CF_TICK_GRAPH_DATA_BACKENDS }}"
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
-          CF_TICK_CONTAINER_TAG: latest
 
       - name: deploy
         if: github.ref == 'refs/heads/master' && ! cancelled() && ! env.CI_SKIP

diff --git a/autotick-bot/install_bot_code.sh b/autotick-bot/install_bot_code.sh
@@ -41,7 +41,9 @@ else
     echo "Skipping cloning of cf-graph and pinning feedstock"
 fi
 
-docker pull ghcr.io/regro/conda-forge-tick:$(python -c "import conda_forge_tick; print(conda_forge_tick.__version__)")
+bot_tag=$(python -c "import conda_forge_tick; print(conda_forge_tick.__version__)")
+docker_tag=${CF_TICK_CONTAINER_TAG:-${bot_tag}}
+docker pull ghcr.io/regro/conda-forge-tick:${docker_tag}
 
 echo -e "\n\n============================================\n============================================"
 conda info