Skip to content

Commit

Permalink
updated versions to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
jerson committed Nov 30, 2024
1 parent 8c5545f commit a2f6df4
Show file tree
Hide file tree
Showing 32 changed files with 232 additions and 2,131 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ env:

jobs:
binding:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- uses: android-actions/setup-android@v2
- uses: android-actions/setup-android@v3
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21d
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: '^1.21'
go-version: '^1.23'
- name: Build
run: make binding_android
env:
Expand All @@ -47,8 +47,7 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libopenpgp_bridge_android
path: output.tar.gz

10 changes: 5 additions & 5 deletions .github/workflows/darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ env:

jobs:
binding:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '^1.21'
go-version: '^1.23'
- name: Build
run: make binding_darwin
- name: Compress
Expand All @@ -35,7 +35,7 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libopenpgp_bridge_darwin
path: output.tar.gz
8 changes: 4 additions & 4 deletions .github/workflows/flatbuffers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ env:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
language: [ dart, go, ts, java, kotlin, swift, rust ]
language: [ dart, go, ts, java, kotlin, swift ]
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Flatbuffers
run: make flatbuffers_deps
- name: Build
Expand All @@ -40,7 +40,7 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: flatbuffers_libopenpgp_bridge_${{ matrix.language }}
path: output.tar.gz
24 changes: 12 additions & 12 deletions .github/workflows/gomobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ env:

jobs:
android:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- uses: android-actions/setup-android@v2
- uses: android-actions/setup-android@v3
- name: Install Android Platform
run: |
sdkmanager "platform-tools"
Expand All @@ -33,9 +33,9 @@ jobs:
id: setup-ndk
with:
ndk-version: r21d
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: '^1.21'
go-version: '^1.23'
- name: Install Gomobile
run: |
go install golang.org/x/mobile/cmd/gomobile@latest
Expand All @@ -62,18 +62,18 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gomobile_openpgp_android_aar
path: output.tar.gz

ios:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '^1.21'
go-version: '^1.23'
- name: Install Gomobile
run: |
go install golang.org/x/mobile/cmd/gomobile@latest
Expand All @@ -97,7 +97,7 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gomobile_openpgp_ios_xcframework
path: output.tar.gz
46 changes: 11 additions & 35 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,15 @@ env:
VERSION: ${{ github.event.inputs.version || (startsWith(github.ref, 'refs/tags/') && github.ref || '') }}

jobs:
binding_arm7:
runs-on: macos-13
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: '^1.21'
- name: Build Go
run: ./go.sh 1.14.15 openpgp
- name: Build
run: |
export PATH="/tmp/go/bin:$PATH"
make binding_ios_armv7
- uses: actions/upload-artifact@v3
with:
name: output_binding_arm7
path: output
retention-days: 1

binding:
runs-on: macos-13
needs: binding_arm7
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v2
with:
name: output_binding_arm7
path: output
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '^1.21'
go-version: '^1.23'
- name: Build Go
run: ./go.sh 1.21.0 openpgp
run: ./go.sh 1.23.3 fastopenpgp
- name: Build
run: |
export PATH="/tmp/go/bin:$PATH"
Expand All @@ -63,20 +39,20 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libopenpgp_bridge_ios
path: output.tar.gz

xcframework:
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '^1.21'
go-version: '^1.23'
- name: Build Go
run: ./go.sh 1.21.0 openpgp
run: ./go.sh 1.23.3 fastopenpgp
- name: Build
run: |
export PATH="/tmp/go/bin:$PATH"
Expand All @@ -92,7 +68,7 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libopenpgp_bridge_ios_xcframework
path: output.tar.gz
7 changes: 3 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ env:

jobs:
binding:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: docker-practice/actions-setup-docker@master
- uses: actions/checkout@v4
- name: Build
run: make binding_linux
- name: Compress
Expand All @@ -33,7 +32,7 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libopenpgp_bridge_linux
path: output.tar.gz
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: heinrichreimer/github-changelog-generator-action@v2.1.1
- uses: heinrichreimer/github-changelog-generator-action@v2
id: changelog
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:

jobs:
tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
go: [ '1.20', '1.14']
go: [ '1.23']
name: Using Go ${{ matrix.go }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}
- name: Tests
Expand All @@ -28,7 +28,7 @@ jobs:

finish:
needs: tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: shogo82148/actions-goveralls@v1
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ env:

jobs:
binding:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '^1.21'
go-version: '^1.23'
- name: Install TinyGo
run: |
wget https://github.com/tinygo-org/tinygo/releases/download/v0.28.1/tinygo_0.28.1_amd64.deb
sudo dpkg -i tinygo_0.28.1_amd64.deb
wget https://github.com/tinygo-org/tinygo/releases/download/v0.34.0/tinygo_0.34.0_amd64.deb
sudo dpkg -i tinygo_0.34.0_amd64.deb
- name: Build
run: make wasm
- name: Compress
Expand All @@ -39,7 +39,7 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libopenpgp_bridge_wasm
path: output.tar.gz
9 changes: 4 additions & 5 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ env:

jobs:
binding:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: docker-practice/actions-setup-docker@master
- uses: actions/checkout@v4
- name: Build
run: make binding_windows
- name: Compress
Expand All @@ -33,7 +32,7 @@ jobs:
tag: ${{ env.VERSION }}
overwrite: true
- if: ${{ env.VERSION=='' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libopenpgp_bridge_windows
path: output.tar.gz
path: output.tar.gz
6 changes: 1 addition & 5 deletions Makefile.flatbuffers
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ flatbuffers_deps:
cd /tmp && \
git clone https://github.com/google/flatbuffers.git -b master && \
cd flatbuffers && \
git checkout v2.0.6 && \
git checkout v24.3.25 && \
cmake -G "Unix Makefiles" && \
make && \
sudo make install && \
Expand Down Expand Up @@ -38,7 +38,3 @@ flatbuffers_kotlin:
flatbuffers_java:
rm -rf output/flatbuffers/java && mkdir -p output/flatbuffers/java
flatc --java --gen-mutable -o ./output/flatbuffers/java flatbuffers/*.fbs

flatbuffers_rust:
rm -rf output/flatbuffers/rust && mkdir -p output/flatbuffers/rust
flatc --rust --gen-mutable -o ./output/flatbuffers/rust flatbuffers/*.fbs
Loading

0 comments on commit a2f6df4

Please sign in to comment.