Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/build-gosop/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
using: "composite"
steps:
- name: Checkout gopenpgp
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ inputs.gopenpgp-ref }}
path: gopenpgp
Expand All @@ -32,7 +32,7 @@ runs:
with:
go-version: ^1.18
- name: Check out gosop
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: ProtonMail/gosop
ref: ${{ env.GOSOP_BRANCH_REF}}
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@ on:
pull_request:
branches: [ main, v3 ]

permissions: {}

jobs:
build:
name: Build library for Android with gomobile
runs-on: ubuntu-latest

steps:
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 8
uses: actions/setup-java@v5
with:
java-version: 1.8
distribution: 'zulu'
java-version: 8

- name: Set up Go 1.x
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version: ^1.16
id: go
Expand All @@ -30,7 +33,7 @@ jobs:
link-to-sdk: true

- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Build
run: |
Expand All @@ -41,7 +44,7 @@ jobs:
find dist

- name: Upload Android artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Android build
path: dist/android
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ on:
pull_request:
branches: [ main, Proton ]

permissions: {}

jobs:
test:
name: Test with latest golang
runs-on: ubuntu-latest
steps:
- name: Check out repo
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set up latest golang
uses: actions/setup-go@v5
uses: actions/setup-go@v6
with:
go-version: '^1.18'

Expand All @@ -26,10 +28,10 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v5
- uses: actions/setup-go@v6
with:
go-version: '1.23'
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
pull_request:
branches: [ main, v3 ]

permissions: {}

jobs:
build:
name: Build library for iOS with gomobile
Expand All @@ -19,13 +21,13 @@ jobs:
id: xcode

- name: Set up Go 1.x
uses: actions/setup-go@v2
uses: actions/setup-go@v6
with:
go-version: ^1.16
id: go

- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Build
env:
Expand All @@ -35,7 +37,7 @@ jobs:
find dist

- name: Upload xcframework
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: gopenpgp.xcframework
path: dist/apple/gopenpgp.xcframework
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/sop-test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@ on:
pull_request:
branches: [ main, v3 ]

permissions: {}

jobs:

build-gosop:
name: Build gosop from branch
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Build gosop from branch
uses: ./.github/actions/build-gosop
with:
binary-location: ./gosop-${{ github.sha }}
# Upload as artifact
- name: Upload gosop artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: gosop-${{ github.sha }}
path: ./gosop-${{ github.sha }}
Expand All @@ -28,15 +30,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Build gosop from branch
uses: ./.github/actions/build-gosop
with:
gopenpgp-ref: ${{ github.base_ref }}
binary-location: ./gosop-target
# Upload as artifact
- name: Upload gosop-target artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: gosop-target
path: ./gosop-target
Expand All @@ -55,7 +57,7 @@ jobs:
- build-gosop-target
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
# Fetch gosop from target
- name: Download gosop-target
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -94,12 +96,12 @@ jobs:
RESULTS_HTML: .github/test-suite/test-suite-results.html
# Upload results
- name: Upload test results json artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: test-suite-results.json
path: .github/test-suite/test-suite-results.json
- name: Upload test results html artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: test-suite-results.html
path: .github/test-suite/test-suite-results.html
Expand All @@ -110,7 +112,7 @@ jobs:
needs: test-suite
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Download test results json artifact
id: download-test-results
uses: actions/download-artifact@v4
Expand Down
Loading