Merge pull request #11426 from camptocamp/fix-project-workflow

Fix project workflow for new Ubuntu version
camptocamp · Oct 2, 2024 · d353feb · d353feb
2 parents c79c141 + a2f2828
commit d353feb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...geoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml b/...geoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.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/...portal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/rebuild.yaml b/...portal_geoportal/scaffolds/create/{{cookiecutter.project}}/.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