From d4f530b7eae5e445858b226e5406597c73215bda Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Fri, 17 Jun 2022 20:12:14 +0200 Subject: [PATCH] chore: use go1.18.3 (#816) This diff changes all github actions and mk to use go1.18.3. That's what I am using locally. Also, both oohttp and oocrypto are on go1.18.3 already. --- .github/workflows/alltests.yml | 2 +- .github/workflows/android.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/generate.yml | 2 +- .github/workflows/gosec.yml | 2 +- .github/workflows/ios.yml | 2 +- .github/workflows/jafar.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/miniooni.yml | 2 +- .github/workflows/netxlite.yml | 2 +- .github/workflows/oohelperd.yml | 2 +- .github/workflows/qafbmessenger.yml | 2 +- .github/workflows/qahhfm.yml | 2 +- .github/workflows/qahirl.yml | 2 +- .github/workflows/qatelegram.yml | 2 +- .github/workflows/qawebconnectivity.yml | 2 +- .github/workflows/qawhatsapp.yml | 2 +- .github/workflows/tarball.yml | 2 +- .github/workflows/windows.yml | 2 +- Readme.md | 2 +- mk | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/alltests.yml b/.github/workflows/alltests.yml index 228998f..fa5a25b 100644 --- a/.github/workflows/alltests.yml +++ b/.github/workflows/alltests.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: go test -race -tags shaping ./... diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 5aeffe0..287ad5d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 75c4cea..e22f549 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: go: - - "1.18.2" + - "1.18.3" steps: - uses: magnetikonline/action-golang-cache@v2 with: diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index d882052..58ceac6 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: go generate ./... diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index d1341bb..74471b0 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: go: - - "1.18.2" + - "1.18.3" steps: - name: Checkout Source uses: actions/checkout@v2 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index e5e3d4d..9dc2cbf 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/jafar.yml b/.github/workflows/jafar.yml index 2cc6e47..7307245 100644 --- a/.github/workflows/jafar.yml +++ b/.github/workflows/jafar.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: go build -v ./internal/cmd/jafar - run: sudo ./testjafar.bash diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 893ffc5..f670c35 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/.github/workflows/miniooni.yml b/.github/workflows/miniooni.yml index fe4ab56..8ab6d74 100644 --- a/.github/workflows/miniooni.yml +++ b/.github/workflows/miniooni.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 with: diff --git a/.github/workflows/netxlite.yml b/.github/workflows/netxlite.yml index df57129..fb5b080 100644 --- a/.github/workflows/netxlite.yml +++ b/.github/workflows/netxlite.yml @@ -13,7 +13,7 @@ jobs: runs-on: "${{ matrix.os }}" strategy: matrix: - go: [ "1.18.2" ] + go: [ "1.18.3" ] os: [ "ubuntu-20.04", "windows-2019", "macos-10.15" ] steps: - uses: magnetikonline/action-golang-cache@v2 diff --git a/.github/workflows/oohelperd.yml b/.github/workflows/oohelperd.yml index e3ab0ab..7c72ae2 100644 --- a/.github/workflows/oohelperd.yml +++ b/.github/workflows/oohelperd.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - name: build oohelperd binary run: GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o ./CLI/oohelperd-linux-amd64 -v -tags netgo -ldflags="-s -w -extldflags -static" ./internal/cmd/oohelperd diff --git a/.github/workflows/qafbmessenger.yml b/.github/workflows/qafbmessenger.yml index 1ad1b24..60af15b 100644 --- a/.github/workflows/qafbmessenger.yml +++ b/.github/workflows/qafbmessenger.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "fbmessenger" diff --git a/.github/workflows/qahhfm.yml b/.github/workflows/qahhfm.yml index 29ae892..73a4a36 100644 --- a/.github/workflows/qahhfm.yml +++ b/.github/workflows/qahhfm.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "hhfm" diff --git a/.github/workflows/qahirl.yml b/.github/workflows/qahirl.yml index 56adbee..a92f4f2 100644 --- a/.github/workflows/qahirl.yml +++ b/.github/workflows/qahirl.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "hirl" diff --git a/.github/workflows/qatelegram.yml b/.github/workflows/qatelegram.yml index 6fa7503..b2712f2 100644 --- a/.github/workflows/qatelegram.yml +++ b/.github/workflows/qatelegram.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "telegram" diff --git a/.github/workflows/qawebconnectivity.yml b/.github/workflows/qawebconnectivity.yml index bb5774c..df8f116 100644 --- a/.github/workflows/qawebconnectivity.yml +++ b/.github/workflows/qawebconnectivity.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "webconnectivity" diff --git a/.github/workflows/qawhatsapp.yml b/.github/workflows/qawhatsapp.yml index eb5fd34..1deb123 100644 --- a/.github/workflows/qawhatsapp.yml +++ b/.github/workflows/qawhatsapp.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 - run: ./QA/rundocker.bash "whatsapp" diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml index a36d82a..0bbcd16 100644 --- a/.github/workflows/tarball.yml +++ b/.github/workflows/tarball.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: "1.18.2" + go-version: "1.18.3" - name: Generate release tarball run: | VERSION=${GITHUB_REF_NAME#v} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 75b615f..8a5bdca 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v1 with: - go-version: "1.18.2" + go-version: "1.18.3" - uses: actions/checkout@v2 with: fetch-depth: 0 diff --git a/Readme.md b/Readme.md index 0c4e75d..5801b84 100644 --- a/Readme.md +++ b/Readme.md @@ -53,7 +53,7 @@ Please, make sure you add the `ooni/probe-cli` label. ### ooniprobe -Be sure you have golang 1.18.2 and a C compiler (Mingw-w64 for Windows). You +Be sure you have golang 1.18.3 and a C compiler (Mingw-w64 for Windows). You can build using: ```bash diff --git a/mk b/mk index 60ed290..4b3d167 100755 --- a/mk +++ b/mk @@ -64,7 +64,7 @@ GOLANG_EXTRA_FLAGS = #help: #help: * GOLANG_VERSION_NUMBER : the expected version number for golang. -GOLANG_VERSION_NUMBER = 1.18.2 +GOLANG_VERSION_NUMBER = 1.18.3 #help: #help: * MINGW_W64_VERSION : the expected mingw-w64 version.