Skip to content

Commit e11f2a0

Browse files
committed
ci: Adapt CI to proton branch
1 parent 8faf8e2 commit e11f2a0

File tree

5 files changed

+15
-28
lines changed

5 files changed

+15
-28
lines changed

.github/workflows/android.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main, v3 ]
7+
branches: [ main, Proton ]
88

99
jobs:
1010
build:
@@ -18,9 +18,9 @@ jobs:
1818
java-version: 1.8
1919

2020
- name: Set up Go 1.x
21-
uses: actions/setup-go@v2
21+
uses: actions/setup-go@v5
2222
with:
23-
go-version: ^1.16
23+
go-version: '^1.16'
2424
id: go
2525

2626
- name: Install NDK

.github/workflows/go.yml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main, v3 ]
7+
branches: [ main, Proton ]
88

99
jobs:
1010
test:
@@ -15,35 +15,20 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- name: Set up latest golang
18-
uses: actions/setup-go@v3
18+
uses: actions/setup-go@v5
1919
with:
20-
go-version: ^1.18
20+
go-version: '^1.18'
2121

2222
- name: Test
2323
run: go test -v -race ./...
24-
25-
test-old:
26-
name: Test with 1.17
27-
runs-on: ubuntu-latest
28-
steps:
29-
- name: Check out repo
30-
uses: actions/checkout@v4
31-
32-
- name: Set up Go 1.17
33-
uses: actions/setup-go@v3
34-
with:
35-
go-version: 1.17
36-
37-
- name: Test
38-
run: go test -v -race ./...
3924

4025
lint:
4126
name: Lint
4227
runs-on: ubuntu-latest
4328
steps:
44-
- uses: actions/setup-go@v3
29+
- uses: actions/setup-go@v5
4530
with:
46-
go-version: 1.17
31+
go-version: '1.22'
4732
- uses: actions/checkout@v4
4833
- name: golangci-lint
4934
uses: golangci/golangci-lint-action@v3

.github/workflows/ios.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main, v3 ]
7+
branches: [ main, Proton ]
88

99
jobs:
1010
build:
@@ -18,10 +18,10 @@ jobs:
1818
xcode-version: 15.3.0
1919
id: xcode
2020

21-
- name: Set up Go 1.x
22-
uses: actions/setup-go@v2
21+
- name: Set up Go 1.22
22+
uses: actions/setup-go@v5
2323
with:
24-
go-version: ^1.16
24+
go-version: '1.22'
2525
id: go
2626

2727
- name: Checkout

.github/workflows/sop-test-suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: SOP interoperability test suite
22

33
on:
44
pull_request:
5-
branches: [ main, v3 ]
5+
branches: [ main, Proton ]
66

77
jobs:
88

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ issues:
2020
- ST1003 # CamelCase variables; see constants/cipher.go
2121
- missing output for example, go test can't validate it
2222
- variable 'hasExpiredEntity' is only used in the if-statement
23+
- SA1019
24+
- commentFormatting
2325
exclude-rules:
2426
- path: crypto/key_clear.go
2527
text: "SA1019"

0 commit comments

Comments
 (0)