From dfb70a4c605f6e38839f7e54ce5dce43bcdf394a Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Mon, 6 Apr 2026 15:53:56 +0300 Subject: [PATCH] Update workflows and makefiles (14 commits squashed) --- .github/workflows/build-rpm-x86-64.yml | 49 ++++++++++++++++++ .github/workflows/build-rpm.yml | 71 ++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 .github/workflows/build-rpm-x86-64.yml create mode 100644 .github/workflows/build-rpm.yml diff --git a/.github/workflows/build-rpm-x86-64.yml b/.github/workflows/build-rpm-x86-64.yml new file mode 100644 index 0000000..b279ada --- /dev/null +++ b/.github/workflows/build-rpm-x86-64.yml @@ -0,0 +1,49 @@ +name: RPM build + +on: + push: + branches: [ "master" ] + paths: [ 'RELEASE', '.github/workflows/build-rpm-x86-64.yml' ] + +jobs: + ci: + name: "${{ matrix.target }}" + strategy: + matrix: + target: + - ubuntu-latest + runs-on: ${{ matrix.target }} + steps: + - uses: actions/checkout@v4 + - name: env + run: | + pwd + echo "RELEASE=$(cat RELEASE)" >> $GITHUB_ENV + echo "VERSION=$(date +%y%m%d%H%M%S)" >> $GITHUB_ENV + 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 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 + run: | + git archive --format=tar --prefix=3proxy-$RELEASE/ master | gzip >~/rpmbuild/SOURCES/3proxy-$RELEASE.tar.gz + cp scripts/rh/3proxy.spec ~/rpmbuild/SPECS/3proxy-$RELEASE.spec + - name: rpmbuild + run: | + ret=`pwd` + cd ~/rpmbuild/SPECS + rpmbuild --define "devel_version $VERSION" -ba 3proxy-$RELEASE.spec + cd $ret + mv ~/rpmbuild/RPMS/x86_64/3proxy-$RELEASE-1.x86_64.rpm ../3proxy-$RELEASE.x86_64.rpm + - name: Get artifact + uses: actions/upload-artifact@v4 + with: + name: "3proxy-${{ env.RELEASE }}-rpm" + path: "*.rpm" diff --git a/.github/workflows/build-rpm.yml b/.github/workflows/build-rpm.yml new file mode 100644 index 0000000..ca00689 --- /dev/null +++ b/.github/workflows/build-rpm.yml @@ -0,0 +1,71 @@ +name: RPM build + +on: + push: + branches: [ "master" ] + paths: [ 'RELEASE', '.github/workflows/build-rpm.yml' ] + +jobs: + ci: + name: "${{ matrix.target }}" + strategy: + matrix: + target: + - ubuntu-latest + runs-on: ${{ matrix.target }} + steps: + - uses: actions/checkout@v4 + - name: env + run: | + pwd + echo "RELEASE==$(cat RELEASE)" >> $GITHUB_ENV + echo "VERSION==$(date +%y%m%d%H%M%S)" >> $GITHUB_ENV + 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 + sudo dpkg --add-architecture armhf + echo "Types: deb" >~/arm64.sources + echo "URIs: http://ports.ubuntu.com/ubuntu-ports/" >>~/arm64.sources + echo "Suites: noble noble-updates noble-security" >>~/arm64.sources + echo "Components: main restricted universe multiverse" >>~/arm64.sources + echo "rchitectures: arm64" >>~/arm64.sources + echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/arm64.sources + sudo cp ~/arm64.sources /etc/apt/sources.list.d/arm64.sources + cat /etc/apt/sources.list.d/arm64.sources + echo "Types: deb" >~/armhf.sources + echo "URIs: http://ports.ubuntu.com/ubuntu-ports/" >>~/armhf.sources + echo "Suites: noble noble-updates noble-security" >>~/armhf.sources + echo "Components: main restricted universe multiverse" >>~/armhf.sources + echo "rchitectures: armhf" >>~/armhf.sources + echo "Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg" >>~/armhf.sources + sudo cp ~/armhf.sources /etc/apt/sources.list.d/armhf.sources + sudo apt update + sudo apt install libssl-dev libpam-dev libpcre2-dev libssl-dev:arm64 libpam-dev:arm64 libpcre2-dev:arm64 libssl-dev:armhf libpam-dev:armhf libpcre2-dev:armhf rpm crossbuild-essential-arm64 crossbuild-essential-armhf + - name: make rpmbuild dir + run: mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} + - name: configure rpm env + run: | + git archive --format=tar --prefix=3proxy-$RELEASE/ master | gzip >~/rpmbuilds/SOURCES/3proxy-$RELEASE.tar.gz + cp scripts/rh/3proxy.spec ~/rpmbuild/SPECS/3proxy-$RELEASE.spec + - name: rpmbuild + run: | + ret=`pwd` + cd ~/rpmbuild/SPECS + rpmbuild --define "devel_version $VERSION" -ba 3proxy-$RELEASE.spec + rpmbuild -ba --define "devel_version $VERSION" --define "_arch arm" --define "cross yes" --target=arm-linux-gnueabi 3proxy-$RELEASE.spec + rpmbuild -ba --define "devel_version $VERSION" --define "_arch aarch64" --define "cross yes" --target=aarch64-linux-gnu 3proxy-$RELEASE.spec + cd $ret + mv ~/rpmbuild/RPMS/x86_64/3proxy-$RELEASE-1.x86_64.rpm ../3proxy-$RELEASE.x86_64.rpm + mv ~/rpmbuild/RPMS/arm/3proxy-$RELEASE-1.arm.rpm ../3proxy-$RELEASE.arm.rpm + mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm ../3proxy-$RELEASE.aarch64.rpm + - name: Get artifact + uses: actions/upload-artifact@v4 + with: + name: "3proxy-${{ env.RELEASE }}-rpm" + path: "*.rpm"