Skip to content

Commit 33d4c8a

Browse files
committed
Fix NetBSD CI
1 parent e687c4c commit 33d4c8a

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.github/workflows/actions-ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ jobs:
739739
tests/ci/run_bsd_tests.sh
740740
netbsd:
741741
if: github.repository_owner == 'aws'
742-
needs: [sanity-test-run]
742+
#needs: [sanity-test-run]
743743
name: NetBSD ${{ matrix.version }} (${{ matrix.arch }}) test
744744
runs-on: ubuntu-latest
745745
strategy:
@@ -750,7 +750,6 @@ jobs:
750750
- "arm64"
751751
version:
752752
- "10.1"
753-
- "9.4"
754753
steps:
755754
- uses: actions/checkout@v4
756755
with:
@@ -770,12 +769,14 @@ jobs:
770769
memory: 12G
771770
cpu_count: 3
772771
run: |
773-
/usr/sbin/pkg_add cmake gmake perl
774-
ARCH=${{ (matrix.arch == 'x86_64' && 'amd') || 'arm' }}
772+
set -x
773+
export PKG_PATH="https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/${{ (matrix.arch == 'arm64' && 'aarch64') || 'x86_64' }}/${{ matrix.version }}/All"
774+
sudo -E pkg_add -u curl cmake gmake perl mozilla-rootcerts
775+
ARCH=${{ (matrix.arch == 'x86-64' && 'amd') || 'arm' }}
775776
export PATH="/usr/pkg/bin:/usr/pkg/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
776777
curl -O https://dl.google.com/go/go1.25.2.netbsd-${ARCH}64.tar.gz
777-
mkdir -p /usr/local
778-
tar -C /usr/local -xzf go1.25.2.netbsd-${ARCH}64.tar.gz
778+
sudo mkdir -p /usr/local
779+
sudo tar -C /usr/local -xzf go1.25.2.netbsd-${ARCH}64.tar.gz
779780
export GOROOT=/usr/local/go
780781
export PATH="$PATH:$GOROOT/bin"
781782
tests/ci/run_bsd_tests.sh

tests/ci/run_bsd_tests.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ set -ex
66

77
source tests/ci/common_posix_setup.sh
88

9+
# Our NetBSD CI environment gives a "No route to host" error when connecting to `ocsp.sectigo.com:80`.
10+
if [[ "$KERNEL_NAME" == "NetBSD" ]]; then
11+
export GTEST_FILTER="-*.AmazonTrustServices*"
12+
fi
13+
914
if [ "$PLATFORM" != "amd64" ] && [ "$PLATFORM" != "x86_64" ]; then
1015
# ARM64 platforms are tested via emulation.
1116
# We narrow testing to libcrypto to avoid exceeding 1 hour duration

0 commit comments

Comments
 (0)