diff options
| author | nicolargo <nicolashennion@gmail.com> | 2024-05-02 09:08:04 +0200 |
|---|---|---|
| committer | nicolargo <nicolashennion@gmail.com> | 2024-05-02 09:08:04 +0200 |
| commit | 66bc871488024129656388ee229d3ed4a9fd677d (patch) | |
| tree | c7d91f9deb3150fa6aaa5cacfe6853d91cf2fb89 /.github | |
| parent | aa9a92d3b074d72b4ccd7114e85225513965501c (diff) | |
Fix OS version for the Github tests / Only build Docker images on official architecture (remove i386) / Test if #2735 is corrected
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 541c2336..a66f9e01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,10 +8,10 @@ env: DEFAULT_DOCKER_IMAGE: nicolargo/glances NODE_ENV: ${{ (contains('refs/heads/master', github.ref) || startsWith(github.ref, 'refs/tags/v')) && 'prod' || 'dev' }} PUSH_BRANCH: ${{ 'refs/heads/develop' == github.ref || 'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/v') }} - # Alpine image do not support linux/arm/v6 and linux/arm/v6 - See issue #2735 - DOCKER_PLATFORMS: linux/amd64,linux/arm64,linux/386 - # Ubuntu image only support linux/amd64 and linux/arm64 - See issue #2185 - DOCKER_PLATFORMS_UBUNTU: linux/amd64,linux/arm64 + # Alpine image platform: https://hub.docker.com/_/alpine + DOCKER_PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v6,linux/arm/v7 + # Ubuntu image platforms list: https://hub.docker.com/_/ubuntu + DOCKER_PLATFORMS_UBUNTU: linux/amd64,linux/arm64/v8,linux/arm/v7 on: workflow_call: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b19bad50..46b4c585 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: test-linux: # https://github.com/actions/runner-images?tab=readme-ov-file#available-images - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] @@ -55,7 +55,7 @@ jobs: # test-windows: # # https://github.com/actions/runner-images?tab=readme-ov-file#available-images - # runs-on: windows-latest + # runs-on: windows-2022 # strategy: # matrix: # # Python version "3.12" introduce this issue: @@ -83,7 +83,7 @@ jobs: test-macos: # https://github.com/actions/runner-images?tab=readme-ov-file#available-images - runs-on: macos-latest + runs-on: macos-14 strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] @@ -99,6 +99,7 @@ jobs: - name: Install dependencies run: | + python -m pip install --upgrade pip if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Unitary tests |