Compare commits

...

2 Commits

Author SHA1 Message Date
Brad Warren
5f81b2bcbf actually test everything 2022-09-22 07:04:42 -07:00
Brad Warren
3330d9a761 upgrade base docker image 2022-09-22 06:58:33 -07:00
2 changed files with 9 additions and 13 deletions

View File

@@ -6,12 +6,10 @@ jobs:
matrix:
amd64:
DOCKER_ARCH: amd64
# Do not run the heavy non-amd64 builds for test branches
${{ if not(startsWith(variables['Build.SourceBranchName'], 'test-')) }}:
arm32v6:
DOCKER_ARCH: arm32v6
arm64v8:
DOCKER_ARCH: arm64v8
arm32v6:
DOCKER_ARCH: arm32v6
arm64v8:
DOCKER_ARCH: arm64v8
# The default timeout of 60 minutes is a little low for compiling
# cryptography on ARM architectures.
timeoutInMinutes: 180
@@ -121,12 +119,10 @@ jobs:
matrix:
amd64:
SNAP_ARCH: amd64
# Do not run the heavy non-amd64 builds for test branches
${{ if not(startsWith(variables['Build.SourceBranchName'], 'test-')) }}:
armhf:
SNAP_ARCH: armhf
arm64:
SNAP_ARCH: arm64
armhf:
SNAP_ARCH: armhf
arm64:
SNAP_ARCH: arm64
timeoutInMinutes: 0
steps:
- script: |

View File

@@ -1,6 +1,6 @@
# Docker Arch (amd64, arm32v6, ...)
ARG TARGET_ARCH
FROM ${TARGET_ARCH}/python:3.8-alpine3.12
FROM ${TARGET_ARCH}/python:3.10-alpine3.16
# Qemu Arch (x86_64, arm, ...)
ARG QEMU_ARCH