Skip to content

Commit

Permalink
change ubuntu image to 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
phnzb committed Dec 2, 2024
1 parent 0073ff4 commit dcbda0f
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 30 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:

prepare-build-matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
archs: ${{ steps.matrix-vars.outputs.ARCHS }}
types: ${{ steps.matrix-vars.outputs.TYPES }}
Expand All @@ -25,7 +25,7 @@ jobs:
echo TYPES=[\"$BUILD_TYPES\"] | sed 's| |","|g' >> "$GITHUB_OUTPUT"
build-bin:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: prepare-build-matrix
strategy:
matrix:
Expand All @@ -47,7 +47,7 @@ jobs:
curl -L https://github.com/nzbgetcom/build-files/releases/download/v1.0/lib-${{ matrix.arch }}.tar.gz -o /build/lib/lib.tar.gz
tar zxf /build/android/ndk.tar.gz -C /build/android
tar zxf /build/lib/lib.tar.gz -C /build/lib
sudo apt-get install -y autoconf automake bc build-essential cmake cpio curl file git libtool pkg-config rsync unzip wget libtinfo5
sudo apt-get install -y autoconf automake bc build-essential cmake cpio curl file git libtool pkg-config rsync unzip wget libtinfo6
- name: Build
run: bash linux/build-nzbget.sh bin ${{ matrix.arch }} ${{ matrix.type }} ${{ env.BUILD_TESTING }}
Expand All @@ -68,7 +68,7 @@ jobs:
retention-days: 5

build-installer:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: build-bin

steps:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
permissions:
actions: write
secrets: inherit

build-linux-pkg:
uses: ./.github/workflows/linux-pkg.yml
with:
Expand All @@ -45,15 +45,15 @@ jobs:
generate-signatures:
env:
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [build-windows, build-linux, build-osx, build-android, build-freebsd, repack-qnap, build-linux-pkg]
permissions:
actions: write
steps:

- name: Download build artifacts
uses: actions/download-artifact@v4

- name: Generate signatures
run: |
mkdir -p builds
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
cd ..
echo
echo "Done."
- name: Upload build artifacts with signatures
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
contents: write
if: github.ref_name == 'develop'
steps:

- name: Delete tag and release
uses: dev-drprasad/delete-tag-and-release@v0.2.1
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ env:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
packages: write

steps:

- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
fi
echo "tags=$TAGS" >> $GITHUB_OUTPUT
echo "version=$TAG" >> $GITHUB_OUTPUT
- name: Build and push
uses: docker/build-push-action@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
curl -L https://github.com/nzbgetcom/build-files/releases/download/v1.0/lib-x86_64-bsd.tar.gz -o /build/lib/lib.tar.gz
tar zxf /build/freebsd/sysroot.tar.gz -C /build/freebsd
tar zxf /build/lib/lib.tar.gz -C /build/lib
sudo apt-get install -y autoconf automake bc build-essential cmake cpio curl file git libtool pkg-config rsync unzip wget libtinfo5 clang-14
sudo apt-get install -y autoconf automake bc build-essential cmake cpio curl file git libtool pkg-config rsync unzip wget libtinfo6 clang-14
- name: Build
run: bash linux/build-nzbget.sh bin installer ${{ env.BUILD_ARCHS }} ${{ env.BUILD_TYPES }} ${{ env.BUILD_TESTING }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
if: ${{ inputs.external_call == false }}

build-pkg:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [build-linux]
if: always()
permissions:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:

prepare-build-matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
archs: ${{ steps.matrix-vars.outputs.ARCHS }}
types: ${{ steps.matrix-vars.outputs.TYPES }}
Expand All @@ -25,7 +25,7 @@ jobs:
echo TYPES=[\"$BUILD_TYPES\"] | sed 's| |","|g' >> "$GITHUB_OUTPUT"
build-bin:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: prepare-build-matrix
strategy:
matrix:
Expand All @@ -46,7 +46,7 @@ jobs:
curl -L https://github.com/nzbgetcom/build-files/releases/download/v1.0/lib-${{ matrix.arch }}.tar.gz -o /build/lib/lib.tar.gz
tar zxf /build/buildroot/buildroot.tar.gz -C /build/buildroot
tar zxf /build/lib/lib.tar.gz -C /build/lib
sudo apt-get install -y autoconf automake bc build-essential cmake cpio curl file git libtool pkg-config rsync unzip wget libtinfo5
sudo apt-get install -y autoconf automake bc build-essential cmake cpio curl file git libtool pkg-config rsync unzip wget libtinfo6
- name: Build
run: bash linux/build-nzbget.sh bin ${{ matrix.arch }} ${{ matrix.type }} ${{ env.BUILD_TESTING }}
Expand All @@ -67,7 +67,7 @@ jobs:
retention-days: 5

build-installer:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: build-bin

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
retention-days: 5

combine-osx-artifacts:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [build-x64, sign-universal]
permissions:
actions: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/qnap-repack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
if: ${{ inputs.external_call == false }}

repack:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [build-linux]
if: always()
permissions:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
for FILE in *.qpkg; do
[ -f $FILE ] || continue
NEW_FILE=${FILE/$VERSION/$NEW_VERSION}
sudo mv $FILE $NEW_FILE
sudo mv $FILE $NEW_FILE
done
- name: Upload build artifacts
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: windows build
name: windows build

on:
workflow_call:
Expand All @@ -11,7 +11,7 @@ env:

jobs:
prepare-build-matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
archs: ${{ steps.matrix-vars.outputs.ARCHS }}
types: ${{ steps.matrix-vars.outputs.TYPES }}
Expand All @@ -38,7 +38,7 @@ jobs:
type: ${{ fromJSON(needs.prepare-build-matrix.outputs.types) }}

steps:

- name: Checkout
uses: actions/checkout@v4

Expand All @@ -62,7 +62,7 @@ jobs:
build\${{ matrix.type }}${{ matrix.arch }}\${{ matrix.type }}\*.exe
build\${{ matrix.type }}${{ matrix.arch }}\*.nsi
retention-days: 5

build-installer:
runs-on: windows-2022
needs: [build-bin, prepare-build-matrix]
Expand Down
2 changes: 1 addition & 1 deletion linux/build-info.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Supported freebsd architectures: `x86_64-bsd`
1. Linux x86_64 host (Ubuntu 22.04 LTS for example)
2. Installed build dependencies (Ubuntu/Debian example):
```
sudo apt install autoconf automake bc build-essential cmake cpio curl file git libtool pkg-config rsync unzip wget libtinfo5 clang ldd
sudo apt install autoconf automake bc build-essential cmake cpio curl file git libtool pkg-config rsync unzip wget libtinfo5 clang-14
```
3. Installed buildroot - one per architecture (see [Buildroot setup](#buildroot-setup) below)
4. Installed Android NDK and standalone Android toolkits - one per architecture (see [NDK setup](#ndk-setup) below)
Expand Down

0 comments on commit dcbda0f

Please sign in to comment.