From d242993955a39a92e1859586982639cb1ca62325 Mon Sep 17 00:00:00 2001 From: Tania Allard Date: Mon, 25 Mar 2024 18:56:59 +0000 Subject: [PATCH 1/3] :arrow_up: Bump actions versions --- .github/workflows/build_docker_image.yaml | 5 ++++- .github/workflows/release.yaml | 3 ++- .github/workflows/tests.yaml | 24 ++++++++++++----------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_docker_image.yaml b/.github/workflows/build_docker_image.yaml index fa5489081..e5d4d49b7 100644 --- a/.github/workflows/build_docker_image.yaml +++ b/.github/workflows/build_docker_image.yaml @@ -9,6 +9,9 @@ permissions: id-token: write # This is required for requesting the JWT contents: read # This is required for actions/checkout +env: + FORCE_COLOR: "1" # Make tools pretty. + jobs: build_and_push_docker_image: name: "Build Docker Images 🛠" @@ -23,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: "Retrieve secret from Vault 🗝" - uses: hashicorp/vault-action@v2 + uses: hashicorp/vault-action@v3 with: method: jwt url: "https://quansight-vault-public-vault-b2379fa7.d415e30e.z1.hashicorp.cloud:8200" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e9b8f2545..596352372 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,9 +39,10 @@ jobs: - run: echo "Running on ${{ matrix.directory }}" - name: "Check package build - ${{ matrix.directory }} 📦" - uses: hynek/build-and-inspect-python-package@v1 + uses: hynek/build-and-inspect-python-package@v2 with: path: ${{ matrix.directory }} + upload-name-suffix: "-${{ matrix.directory }}" # Adding a separate upload for publishing - name: "Upload build artefacts 📤" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c078552b3..9f08ac1d9 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -2,6 +2,7 @@ name: Tests env: DEFAULT_PYTHON_VERSION: "3.10" + FORCE_COLOR: "1" # Make tools pretty. on: pull_request: @@ -9,6 +10,7 @@ on: branches: - main + # ensuring only one instance is running at a given time concurrency: group: ${{ github.ref }} @@ -37,13 +39,13 @@ jobs: uses: actions/checkout@v4 - name: "Set up env ${{ matrix.os }} 🐍" - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: environment-file: ${{ matrix.environment-file }} miniforge-version: latest # This fixes a "DLL not found" issue importing ctypes from the hatch env - - name: Reinstall Python 3.10 on Windows runner + - name: "Reinstall Python 3.10 on Windows runner" uses: nick-fields/retry@v2.8.3 with: timeout_minutes: 9999 @@ -89,7 +91,7 @@ jobs: uses: actions/checkout@v4 - name: "Set up env 🐍" - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: environment-file: conda-store-server/environment-dev.yaml miniforge-version: latest @@ -114,7 +116,7 @@ jobs: pytest --video on ../tests/test_playwright.py - name: "Upload test results 📤" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: playwright-tests @@ -142,13 +144,13 @@ jobs: working-directory: conda-store strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: "Checkout Repository 🛎" uses: actions/checkout@v4 - name: "Set up Python 🐍" - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -209,20 +211,20 @@ jobs: - conda-store - conda-store-server steps: - - name: "Checkout Repository" + - name: "Checkout Repository 🛎" uses: actions/checkout@v4 - - name: Set up Docker Buildx + - name: "Set up Docker Buildx" uses: docker/setup-buildx-action@v3 - - name: Lint Dockerfiles + - name: "Lint Dockerfiles 🔍" uses: jbergstroem/hadolint-gh-action@v1 with: dockerfile: ${{ matrix.docker-image }}/Dockerfile output_format: tty error_level: 0 - - name: Docker Meta + - name: "Docker Meta" id: meta uses: docker/metadata-action@v5 with: @@ -231,7 +233,7 @@ jobs: tags: | type=sha - - name: Build docker + - name: "Build Docker images" uses: docker/build-push-action@v5 with: context: "${{ matrix.docker-image }}" From 0b847c87ebadd6a18d13df75efd8ff6758b4e83f Mon Sep 17 00:00:00 2001 From: Tania Allard Date: Mon, 25 Mar 2024 19:20:16 +0000 Subject: [PATCH 2/3] Pin baipp to main to use v2 --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 596352372..7fa1384bd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,7 +39,7 @@ jobs: - run: echo "Running on ${{ matrix.directory }}" - name: "Check package build - ${{ matrix.directory }} 📦" - uses: hynek/build-and-inspect-python-package@v2 + uses: hynek/build-and-inspect-python-package@main with: path: ${{ matrix.directory }} upload-name-suffix: "-${{ matrix.directory }}" From 6f4ec003c9406fc604a6cf1c85fe326fcf69aca6 Mon Sep 17 00:00:00 2001 From: Tania Allard Date: Mon, 25 Mar 2024 20:17:48 +0000 Subject: [PATCH 3/3] Pin miniconda setup version --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9f08ac1d9..05a2bd785 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v4 - name: "Set up env ${{ matrix.os }} 🐍" - uses: conda-incubator/setup-miniconda@v3 + uses: conda-incubator/setup-miniconda@v2 with: environment-file: ${{ matrix.environment-file }} miniforge-version: latest