ci: Update to gopenpgp v3

ProtonMail · Dec 7, 2023 · 992dbe0 · 992dbe0
1 parent 0d044f3
commit 992dbe0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/.github/actions/build-gosop/action.yml b/.github/actions/build-gosop/action.yml
@@ -2,6 +2,10 @@ name: 'build-gosop'
 description: 'Build gosop from the current branch'
 
 inputs:
+  gosop-ref: 
+      description: 'gosop branch tag or commit to build from'
+      required: false
+      default: 'main'
 
   gopenpgp-ref: 
     description: 'gopenpgp branch tag or commit to build from'
@@ -30,6 +34,7 @@ runs:
       uses: actions/checkout@v3
       with:
         repository: ProtonMail/gosop
+        ref: ${{ inputs.gosop-ref }}
         path: gosop
     - name: Cache go modules
       uses: actions/cache@v3

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -28,9 +28,6 @@ jobs:
 
     - name: Build
       run: |
-        for d in $ANDROID_NDK_HOME/../23*; do
-          ANDROID_NDK_HOME=$d
-        done
         ./build.sh android
         find dist
 

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -22,21 +22,6 @@ jobs:
       - name: Test
         run: go test -v -race ./...
 
-  test-old:
-    name: Test with 1.15
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out repo
-      uses: actions/checkout@v3
-
-    - name: Set up Go 1.15
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.15
-
-    - name: Test
-      run: go test -v -race ./...
-
   lint:
     name: Lint
     runs-on: ubuntu-latest
@@ -48,4 +33,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50.1
+          version:  1.54.2
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -31,9 +31,6 @@ jobs:
         env:
           platform: ${{ 'iOS Simulator' }}
         run: |
-          for d in $ANDROID_NDK_HOME/../23*; do
-            ANDROID_NDK_HOME=$d
-          done
           ./build.sh apple
           find dist
 

diff --git a/.github/workflows/sop-test-suite.yml b/.github/workflows/sop-test-suite.yml
@@ -16,6 +16,7 @@ jobs:
         uses: ./.github/actions/build-gosop
         with: 
           binary-location: ./gosop-${{ github.sha }}
+          gosop-ref: gosop-gopenpgp-v3
       # Upload as artifact
       - name: Upload gosop artifact
         uses: actions/upload-artifact@v3
@@ -46,7 +47,7 @@ jobs:
     name: Run interoperability test suite
     runs-on: ubuntu-latest
     container: 
-      image: ghcr.io/protonmail/openpgp-interop-test-docker:v1.1.1
+      image: ghcr.io/protonmail/openpgp-interop-test-docker:v.1.1.3
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}