Skip to content

Commit b75b4f4

Browse files
committed
Update Ubuntu version in workflows and Makefile to 24.04
- Changed the Ubuntu version from 22.04 to 24.04 in various GitHub Actions workflows: release.yml, verify-build.yml, and vulnerability-scan.yml. - Updated the default Ubuntu version in the Makefile to 24.04. - Adjusted the matrix for job runners to use the new Ubuntu version ensuring consistency across builds. Signed-off-by: Artem Barger <artem@bargr.net>
1 parent 66ab1b9 commit b75b4f4

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- v3.*
1313

1414
env:
15-
UBUNTU_VER: 22.04
15+
UBUNTU_VER: 24.04
1616
FABRIC_VER: ${{ github.ref_name }}
1717

1818
permissions:
@@ -24,10 +24,10 @@ jobs:
2424
strategy:
2525
matrix:
2626
include:
27-
- image: ubuntu-22.04
27+
- image: ubuntu-24.04
2828
target: linux
2929
arch: amd64
30-
- image: ubuntu-22.04
30+
- image: ubuntu-24.04
3131
target: linux
3232
arch: arm64
3333
- image: macos-11
@@ -39,7 +39,7 @@ jobs:
3939
- image: fabric-windows-latest
4040
target: windows
4141
arch: amd64
42-
runs-on: ubuntu-22.04
42+
runs-on: ubuntu-24.04
4343
steps:
4444
- name: Checkout Fabric Code
4545
uses: actions/checkout@v4
@@ -61,7 +61,7 @@ jobs:
6161
# <path> of the artifact may include multiple files.
6262
path: release/${{ matrix.target }}-${{ matrix.arch }}/*.tar.gz
6363

64-
# build native images using a different runner for each architecture (faster and more reliable than using qemu to build multi-architecture images on ubuntu-22.04)
64+
# build native images using a different runner for each architecture (faster and more reliable than using qemu to build multi-architecture images on ubuntu-24.04)
6565
build-and-push-native-docker-images:
6666
name: Build and Push native images
6767
runs-on: ${{ matrix.runner }}
@@ -74,8 +74,8 @@ jobs:
7474
fail-fast: false
7575
matrix:
7676
runner:
77-
- ubuntu-22.04 # creates linux-amd64 images
78-
- ubuntu-22.04-arm # creates linux-arm64 images
77+
- ubuntu-24.04 # creates linux-amd64 images
78+
- ubuntu-24.04-arm # creates linux-arm64 images
7979

8080
# Dynamic matrix
8181
# If owner is 'hyperledger' run job for Docker Hub and ghcr, otherwise for personal forks just run job for ghcr
@@ -147,7 +147,7 @@ jobs:
147147
# and creates a multi-architecture image manifest with user-friendly tags
148148
merge-and-push-multi-arch-image:
149149
name: Merge and Push multi-arch image
150-
runs-on: ubuntu-22.04
150+
runs-on: ubuntu-24.04
151151
needs:
152152
- build-and-push-native-docker-images
153153

@@ -215,7 +215,7 @@ jobs:
215215
needs:
216216
- build-binaries
217217
- merge-and-push-multi-arch-image
218-
runs-on: ubuntu-22.04
218+
runs-on: ubuntu-24.04
219219
permissions:
220220
contents: write
221221
steps:

.github/workflows/verify-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions:
2020
jobs:
2121
basic-checks:
2222
name: Basic Checks
23-
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
23+
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-24.04' || 'ubuntu-24.04' }}
2424
steps:
2525
- uses: actions/checkout@v4
2626
name: Checkout Fabric Code
@@ -35,7 +35,7 @@ jobs:
3535
unit-tests:
3636
name: Unit Tests
3737
needs: basic-checks
38-
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
38+
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-24.04' || 'ubuntu-24.04' }}
3939
steps:
4040
- uses: actions/checkout@v4
4141
with:
@@ -65,7 +65,7 @@ jobs:
6565
- discovery gossip devmode pluggable
6666
- gateway idemix pkcs11 configtx configtxlator
6767
- sbe nwo msp
68-
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
68+
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-24.04' || 'ubuntu-24.04' }}
6969
steps:
7070
- uses: actions/checkout@v4
7171
name: Checkout Fabric Code

.github/workflows/vulnerability-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
get-latest-releases:
3939
# Only run the scheduled job in hyperledger/fabric repository, not on personal forks
4040
if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'hyperledger/fabric')
41-
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-22.04' || 'ubuntu-22.04' }}
41+
runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-24.04' || 'ubuntu-24.04' }}
4242
strategy:
4343
fail-fast: false
4444
matrix:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
# - unit-test - runs the go-test based unit tests
4646
# - verify - runs unit tests for only the changed package tree
4747

48-
UBUNTU_VER ?= 22.04
48+
UBUNTU_VER ?= 24.04
4949
FABRIC_VER ?= 3.1.0
5050

5151
# 3rd party image version

0 commit comments

Comments
 (0)