Skip to content

Commit

Permalink
skip in CI, not script
Browse files Browse the repository at this point in the history
  • Loading branch information
julienp committed Sep 2, 2024
1 parent cfb0c01 commit 835f362
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
5 changes: 0 additions & 5 deletions .github/scripts/matrix/gen-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,6 @@ def make_entry(*, sdk, arch, default, language_version=None, suffix=None):
matrix["include"].append(make_entry(sdk=sdk, arch=arch, default=True))

for sdk, info in versions.versioned.items():
# We use QEMU to run ARM64 images on AMD64, but .NET Core isn't supported by QEMU, skip it.
# https://gitlab.com/qemu-project/qemu/-/issues/249
if sdk == "dotnet" and arch == "arm64":
continue

# Default version
matrix["include"].append(
make_entry(
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,11 @@ jobs:
}}/providers/${{ env.GCP_WORKLOAD_IDENTITY_PROVIDER }}
- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v2'
- name: Tests
- if: ${{ !(matrix.arch == 'amd64' && matrix.sdk == 'dotnet') }}
# We use QEMU to run ARM64 images on AMD64, but .NET Core isn't supported by QEMU, skip
# running the tests for this combination.
# https://gitlab.com/qemu-project/qemu/-/issues/249
name: Tests
run: |
docker run \
-e RUN_CONTAINER_TESTS=true \
Expand Down

0 comments on commit 835f362

Please sign in to comment.