From b42e1d61a8ea313021f43aee96e2b4c1aca7683d Mon Sep 17 00:00:00 2001
From: Lukas Burkhalter <lukas.burkhalter@proton.ch>
Date: Tue, 26 Nov 2024 09:33:39 +0100
Subject: [PATCH] ci: Adapt CI to proton banch

---
 .github/workflows/android.yml        |  8 ++++----
 .github/workflows/go.yml             | 27 ++++++---------------------
 .github/workflows/ios.yml            | 10 +++++-----
 .github/workflows/sop-test-suite.yml |  2 +-
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index b10c3f25..c6fc3f73 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -2,9 +2,9 @@ name: Gomobile for Android
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, Proton ]
   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..50fda5a7 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -2,9 +2,9 @@ name: Go test and lint
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, Proton ]
   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.22'
 
       - 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..1a4fbe76 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -2,9 +2,9 @@ name: Gomobile for iOS
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, Proton ]
   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: