fix(go-build-alpine): honour OONI_PSIPHON_TAGS (#968)

Closes https://github.com/ooni/probe/issues/2334.

While there, reinstate integration tests, which were also lost in a previous refactoring. However, only run those tests for linux/amd64 because we can be confident that the Go compiler is WAI for all archs we support.

While there, always use bash for running end-to-end tests.

H/T @ainghazal for discovering and reporting this bug.
This commit is contained in:
Simone Basso 2022-10-03 11:55:47 +02:00 committed by GitHub
commit 89a584f93b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 57 additions and 31 deletions

View file

@ -12,26 +12,26 @@ jobs:
runs-on: "ubuntu-20.04"
steps:
- uses: actions/checkout@v2
- run: sudo ./E2E/debian.sh docker i386
- run: sudo ./E2E/debian.bash docker i386
- run: sudo cat DEBIAN_INSTALLED_PACKAGE.txt
test_amd64:
runs-on: "ubuntu-20.04"
steps:
- uses: actions/checkout@v2
- run: sudo ./E2E/debian.sh docker amd64
- run: sudo ./E2E/debian.bash docker amd64
- run: sudo cat DEBIAN_INSTALLED_PACKAGE.txt
test_arm:
runs-on: "ubuntu-20.04"
steps:
- uses: actions/checkout@v2
- run: sudo ./E2E/debian.sh docker armhf
- run: sudo ./E2E/debian.bash docker armhf
- run: sudo cat DEBIAN_INSTALLED_PACKAGE.txt
test_arm64:
runs-on: "ubuntu-20.04"
steps:
- uses: actions/checkout@v2
- run: sudo ./E2E/debian.sh docker arm64
- run: sudo ./E2E/debian.bash docker arm64
- run: sudo cat DEBIAN_INSTALLED_PACKAGE.txt

View file

@ -35,7 +35,7 @@ jobs:
- run: make CLI/linux-static-386
- run: ./E2E/ooniprobe.sh ./CLI/ooniprobe-linux-386
- run: ./E2E/ooniprobe.bash ./CLI/ooniprobe-linux-386
- run: ./script/ghpublish.bash ./CLI/ooniprobe-linux-386 ./CLI/miniooni-linux-386
env:
@ -65,7 +65,18 @@ jobs:
- run: make CLI/linux-static-amd64
- run: ./E2E/ooniprobe.sh ./CLI/ooniprobe-linux-amd64
- run: ./E2E/ooniprobe.bash ./CLI/ooniprobe-linux-amd64
- name: Get GOVERSION content
id: goversion
run: echo ::set-output name=version::$(cat GOVERSION)
- uses: magnetikonline/action-golang-cache@v2
with:
go-version: "${{ steps.goversion.outputs.version }}"
cache-key-suffix: "-windows-${{ steps.goversion.outputs.version }}"
- run: sudo apt-get update -q
- run: sudo apt-get install -y tor
- run: ./E2E/miniooni.bash ./CLI/miniooni-linux-amd64
- run: ./script/ghpublish.bash ./CLI/ooniprobe-linux-amd64 ./CLI/miniooni-linux-amd64
env:
@ -98,7 +109,7 @@ jobs:
- run: make CLI/linux-static-armv6
- run: ./E2E/ooniprobe.sh ./CLI/ooniprobe-linux-armv6
- run: ./E2E/ooniprobe.bash ./CLI/ooniprobe-linux-armv6
- run: ./script/ghpublish.bash ./CLI/ooniprobe-linux-armv6 ./CLI/miniooni-linux-armv6
env:
@ -131,7 +142,7 @@ jobs:
- run: make CLI/linux-static-armv7
- run: ./E2E/ooniprobe.sh ./CLI/ooniprobe-linux-armv7
- run: ./E2E/ooniprobe.bash ./CLI/ooniprobe-linux-armv7
- run: ./script/ghpublish.bash ./CLI/ooniprobe-linux-armv7 ./CLI/miniooni-linux-armv7
env:
@ -164,7 +175,7 @@ jobs:
- run: make CLI/linux-static-arm64
- run: ./E2E/ooniprobe.sh ./CLI/ooniprobe-linux-arm64
- run: ./E2E/ooniprobe.bash ./CLI/ooniprobe-linux-arm64
- run: ./script/ghpublish.bash ./CLI/ooniprobe-linux-arm64 ./CLI/miniooni-linux-arm64
env:

View file

@ -39,7 +39,7 @@ jobs:
- run: make CLI/darwin
- run: ./E2E/ooniprobe.sh ./CLI/ooniprobe-darwin-amd64
- run: ./E2E/ooniprobe.bash ./CLI/ooniprobe-darwin-amd64
- run: |
./script/ghpublish.bash ./CLI/ooniprobe-darwin-amd64 \

View file

@ -64,10 +64,16 @@ jobs:
actions: read
steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v2
with:
name: ooniprobe-windows-amd64.exe
- run: bash.exe ./E2E/ooniprobe.sh ./ooniprobe-windows-amd64.exe
- uses: actions/download-artifact@v2
with:
name: miniooni-windows-amd64.exe
- run: bash.exe ./E2E/ooniprobe.bash ./ooniprobe-windows-amd64.exe
publish:
needs: test