diff --git a/.github/workflows/build-rpm-arm64.yml b/.github/workflows/build-rpm-arm64.yml index 2487dcf..25259ae 100644 --- a/.github/workflows/build-rpm-arm64.yml +++ b/.github/workflows/build-rpm-arm64.yml @@ -1,4 +1,4 @@ -name: RPM build arm +name: RPM build arm64 on: push: @@ -11,7 +11,7 @@ jobs: strategy: matrix: target: - - ubuntu-latest + - ubuntu-24.04-arm runs-on: ${{ matrix.target }} steps: - uses: actions/checkout@v4 @@ -23,33 +23,12 @@ jobs: echo "MAJOR=$(cat RELEASE | cut -d "-" -f 1)" >> $GITHUB_ENV echo "SUBMAJOR=$(cat RELEASE | cut -d "-" -f 2)" >> $GITHUB_ENV echo "MINOR=$(cat RELEASE | cut -d "-" -f 3)" >> $GITHUB_ENV + - name: echo env + run: echo "release $RELEASE version $VERSION major $MAJOR submajor $SUBMAJOR minor $MINOR" - name: Linux libraries run: | sudo apt update - sudo dpkg --add-architecture arm64 - echo "Types: deb" > ~/ubuntu.sources - echo "URIs: http://archive.ubuntu.com/ubuntu/" >> ~/ubuntu.sources - echo "Suites: noble noble-updates noble-backports" >> ~/ubuntu.sources - echo "Components: main restricted universe multiverse" >> ~/ubuntu.sources - echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >> ~/ubuntu.sources - echo "Architectures: amd64" >> ~/ubuntu.sources - echo "" >> ~/ubuntu.sources - echo "Types: deb" >> ~/ubuntu.sources - echo "URIs: http://security.ubuntu.com/ubuntu/" >> ~/ubuntu.sources - echo "Suites: noble-security" >> ~/ubuntu.sources - echo "Components: main restricted universe multiverse" >> ~/ubuntu.sources - echo "Architectures: amd64" >> ~/ubuntu.sources - echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >> ~/ubuntu.sources - echo "" >> ~/ubuntu.sources - echo "Types: deb" >>~/ubuntu.sources - echo "URIs: http://ports.ubuntu.com/ubuntu-ports/" >>~/ubuntu.sources - echo "Suites: noble noble-updates" >>~/ubuntu.sources - echo "Components: main restricted universe multiverse" >>~/ubuntu.sources - echo "Architectures: arm64" >>~/ubuntu.sources - echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/ubuntu.sources - sudo cp ~/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources - sudo apt update - sudo apt install libssl-dev:arm64 libpam0g:arm64 libpam0g-dev:arm64 libpcre2-dev:arm64 rpm crossbuild-essential-arm64 + sudo apt install libssl-dev libpam-dev libpcre2-dev rpm - name: make rpmbuild dir run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} - name: configure rpm env @@ -61,7 +40,7 @@ jobs: run: | ret=`pwd` cd ~/rpmbuild/SPECS - rpmbuild -ba --define "PAMLIB pam0g" --define "_arch aarch64" --define "cross yes" --target=aarch64-linux-gnueabi 3proxy-$RELEASE.spec + rpmbuild -ba 3proxy-$RELEASE.spec cd $ret mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm 3proxy-$RELEASE.arm64.rpm - name: Get artifact @@ -69,3 +48,4 @@ jobs: with: name: "3proxy-${{ env.RELEASE }}-arm64.rpm" path: "*.rpm" +