Merge pull request #1463 from camptocamp/interrupted-upgrade-prod-2-9…

…-master Upgrade failed
camptocamp · Oct 2, 2024 · 2aaedba · 2aaedba
2 parents 3c24c74 + 22899db
commit 2aaedba
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -36,6 +36,8 @@ jobs:
         with:
           python-version: '3.11'
       - run: python3 -m pip install --requirement=ci/requirements.txt
+      - name: Environment information
+        run: c2cciutils-env
 
       - uses: actions/cache@v4
         with:
@@ -57,11 +59,6 @@ jobs:
       # - run: cat env.secrets |grep '^[# A-Z0-9_]\+='|sed -e 's/^[# A-Z0-9_]\+=\(.*\)/::add-mask::\1/g'
       - run: touch env.secrets
 
-      - name: Print environment information
-        run: c2cciutils-env
-        env:
-          GITHUB_EVENT: ${{ toJson(github) }}
-
       - name: Build
         run: ./build
 

diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml
@@ -40,8 +40,12 @@ jobs:
           github-gopass-ci-token: ${{ secrets.GOPASS_CI_GITHUB_TOKEN }}
           patterns: docker
 
-      - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
-      - run: python3 -m pip install --user --requirement=ci/requirements.txt
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - run: python3 -m pip install --requirement=ci/requirements.txt
+      - name: Environment information
+        run: c2cciutils-env
 
       - run: touch env.secrets
       - run: sed -i '/^DOCKER_TAG=/d' env.project

diff --git a/CONST_create_template/.github/workflows/main.yaml b/CONST_create_template/.github/workflows/main.yaml
@@ -26,8 +26,12 @@ jobs:
       #     patterns: docker
       #   if: env.HAS_SECRETS == 'HAS_SECRETS'
 
-      - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
-      - run: python3 -m pip install --user --requirement=ci/requirements.txt
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - run: python3 -m pip install --requirement=ci/requirements.txt
+      - name: Environment information
+        run: c2cciutils-env
 
       - uses: actions/cache@v4
         with:
@@ -48,9 +52,6 @@ jobs:
       # - run: make secrets
       # - run: cat env.secrets |grep '^[# A-Z0-9_]\+='|sed -e 's/^[# A-Z0-9_]\+=\(.*\)/::add-mask::\1/g'
 
-      - name: Environment information
-        run: c2cciutils-env
-
       # - name: Initialize the acceptance tests
       #   run: make acceptance-init
       # - run: c2cciutils-docker-logs

diff --git a/CONST_create_template/.github/workflows/rebuild.yaml b/CONST_create_template/.github/workflows/rebuild.yaml
@@ -36,8 +36,12 @@ jobs:
           github-gopass-ci-token: ${{ secrets.GOPASS_CI_GITHUB_TOKEN }}
           patterns: docker
 
-      - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
-      - run: python3 -m pip install --user --requirement=ci/requirements.txt
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - run: python3 -m pip install --requirement=ci/requirements.txt
+      - name: Environment information
+        run: c2cciutils-env
 
       - name: Build
         run: ./build