Skip to content

Commit

Permalink
ci: Adapt CI to proton branch
Browse files Browse the repository at this point in the history
  • Loading branch information
lubux committed Nov 27, 2024
1 parent 8faf8e2 commit e11f2a0
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main, v3 ]
branches: [ main, Proton ]

jobs:
build:
Expand All @@ -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
Expand Down
25 changes: 5 additions & 20 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main, v3 ]
branches: [ main, Proton ]

jobs:
test:
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main, v3 ]
branches: [ main, Proton ]

jobs:
build:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sop-test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: SOP interoperability test suite

on:
pull_request:
branches: [ main, v3 ]
branches: [ main, Proton ]

jobs:

Expand Down
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit e11f2a0

Please sign in to comment.