Skip to content

Commit

Permalink
Fix OS version for the Github tests / Only build Docker images on off…
Browse files Browse the repository at this point in the history
…icial architecture (remove i386) / Test if #2735 is corrected
  • Loading branch information
nicolargo committed May 2, 2024
1 parent aa9a92d commit 66bc871
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"]
Expand All @@ -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
Expand Down

0 comments on commit 66bc871

Please sign in to comment.