Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI bump versions of GitHubActions and Ubuntu #2994

Merged
merged 4 commits into from
Jul 25, 2024
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
60 changes: 30 additions & 30 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
compiler:
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04]
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -67,18 +67,18 @@ jobs:
- name: Run thrift version
run: /usr/local/bin/thrift -version

# only upload while building ubuntu-20.04
# only upload while building ubuntu-22.04
- name: Archive built thrift compiler
if: matrix.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v3
if: matrix.os == 'ubuntu-22.04'
uses: actions/upload-artifact@v4
with:
name: thrift-compiler
path: compiler/cpp/thrift
retention-days: 3

lib-php:
needs: compiler
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
php-version: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3]
Expand All @@ -103,7 +103,7 @@ jobs:
run: |
./configure $(echo $CONFIG_ARGS_FOR_LIBS | sed 's/without-php/with-php/' | sed 's/without-php_extension/with-php_extension/' )

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: thrift-compiler
path: compiler/cpp
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:

lib-go:
needs: compiler
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
go:
Expand All @@ -157,7 +157,7 @@ jobs:
run: |
./configure $(echo $CONFIG_ARGS_FOR_LIBS | sed 's/without-go/with-go/')

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: thrift-compiler
path: compiler/cpp
Expand All @@ -181,7 +181,7 @@ jobs:

- name: Upload go precross artifacts
if: matrix.go == '1.22'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: go-precross
if-no-files-found: error
Expand All @@ -191,7 +191,7 @@ jobs:

lib-java-kotlin:
needs: compiler
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
GRADLE_VERSION: "8.4"
steps:
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
run: |
./configure $(echo $CONFIG_ARGS_FOR_LIBS | sed 's/without-java/with-java/' | sed 's/without-kotlin/with-kotlin/')

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: thrift-compiler
path: compiler/cpp
Expand All @@ -253,7 +253,7 @@ jobs:
run: make -C lib/java install

- name: Upload java libthrift artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libthrift
if-no-files-found: error
Expand All @@ -266,7 +266,7 @@ jobs:
run: make -C lib/java precross

- name: Upload java precross artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: java-precross
if-no-files-found: error
Expand All @@ -288,7 +288,7 @@ jobs:
run: make -C lib/kotlin precross

- name: Upload kotlin precross artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kotlin-precross
if-no-files-found: error
Expand All @@ -299,7 +299,7 @@ jobs:

lib-swift:
needs: compiler
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand All @@ -310,7 +310,7 @@ jobs:
run: |
./configure $(echo $CONFIG_ARGS_FOR_LIBS | sed 's/without-swift/with-swift/')

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: thrift-compiler
path: compiler/cpp
Expand All @@ -324,7 +324,7 @@ jobs:
run: make -C test/swift precross

- name: Upload swift precross artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: swift-precross
if-no-files-found: error
Expand All @@ -335,7 +335,7 @@ jobs:

lib-rust:
needs: compiler
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
TOOLCHAIN_VERSION: 1.65.0
steps:
Expand Down Expand Up @@ -363,7 +363,7 @@ jobs:
run: |
./configure $(echo $CONFIG_ARGS_FOR_LIBS | sed 's/without-rs/with-rs/')

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: thrift-compiler
path: compiler/cpp
Expand All @@ -386,7 +386,7 @@ jobs:
run: make -C test/rs precross

- name: Upload rust precross artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rs-precross
if-no-files-found: error
Expand All @@ -400,7 +400,7 @@ jobs:

lib-python:
needs: compiler
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
python-version:
Expand Down Expand Up @@ -434,7 +434,7 @@ jobs:
run: |
./configure $(echo $CONFIG_ARGS_FOR_LIBS | sed 's/without-py3/with-py3/')

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: thrift-compiler
path: compiler/cpp
Expand Down Expand Up @@ -463,7 +463,7 @@ jobs:
- lib-rust
- lib-go
- lib-python
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
server_lang: ['java', 'kotlin', 'go', 'rs', 'swift']
Expand All @@ -490,31 +490,31 @@ jobs:
sudo apt-get install -y --no-install-recommends openssl ca-certificates

- name: Download java precross artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: java-precross
path: lib/java/build

- name: Download kotlin precross artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kotlin-precross
path: lib/kotlin

- name: Download swift precross artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: swift-precross
path: test/swift/CrossTests/.build/x86_64-unknown-linux-gnu/debug

- name: Download rust precross artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: rs-precross
path: test/rs/bin

- name: Download go precross artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: go-precross
path: test/go/bin
Expand All @@ -540,10 +540,10 @@ jobs:
--client ${{ matrix.client_lang }}

- name: Upload log files from failed cross test runs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: cross-test-log
name: cross-test-log_${{ matrix.server_lang }}-${{ matrix.client_lang }}
path: test/log/
retention-days: 3

2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:

jobs:
compiler:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down
Loading