diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index b10c3f25..fe98149f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -4,7 +4,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main, v3 ] + branches: [ main, Proton ] jobs: build: @@ -18,9 +18,9 @@ jobs: java-version: 1.8 - name: Set up Go 1.x - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: - go-version: ^1.16 + go-version: '^1.16' id: go - name: Install NDK diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index f243df6c..5fb62884 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -4,7 +4,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main, v3 ] + branches: [ main, Proton ] jobs: test: @@ -15,35 +15,20 @@ jobs: uses: actions/checkout@v4 - name: Set up latest golang - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: - go-version: ^1.18 + go-version: '^1.18' - name: Test run: go test -v -race ./... - - test-old: - name: Test with 1.17 - runs-on: ubuntu-latest - steps: - - name: Check out repo - uses: actions/checkout@v4 - - - name: Set up Go 1.17 - uses: actions/setup-go@v3 - with: - go-version: 1.17 - - - name: Test - run: go test -v -race ./... lint: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: - go-version: 1.17 + go-version: '1.22' - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 4df1b195..43029ed8 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -4,7 +4,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main, v3 ] + branches: [ main, Proton ] jobs: build: @@ -18,10 +18,10 @@ jobs: xcode-version: 15.3.0 id: xcode - - name: Set up Go 1.x - uses: actions/setup-go@v2 + - name: Set up Go 1.22 + uses: actions/setup-go@v5 with: - go-version: ^1.16 + go-version: '1.22' id: go - name: Checkout diff --git a/.github/workflows/sop-test-suite.yml b/.github/workflows/sop-test-suite.yml index 6037a6aa..f6bc7a3d 100644 --- a/.github/workflows/sop-test-suite.yml +++ b/.github/workflows/sop-test-suite.yml @@ -2,7 +2,7 @@ name: SOP interoperability test suite on: pull_request: - branches: [ main, v3 ] + branches: [ main, Proton ] jobs: diff --git a/.golangci.yml b/.golangci.yml index 33f2e665..b971f272 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -20,6 +20,8 @@ issues: - ST1003 # CamelCase variables; see constants/cipher.go - missing output for example, go test can't validate it - variable 'hasExpiredEntity' is only used in the if-statement + - SA1019 + - commentFormatting exclude-rules: - path: crypto/key_clear.go text: "SA1019"