diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b7d849e..26fb4d8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -64,7 +64,7 @@ jobs: path: target/${{ matrix.target }}/release/bpftop if-no-files-found: error - build_rpm_and_release: + create_release: needs: build_and_test runs-on: ubuntu-20.04 if: startsWith(github.ref, 'refs/tags/v') @@ -78,15 +78,12 @@ jobs: pattern: bpftop-* path: artifacts merge-multiple: true - - - name: Build RPM - run: ./build-rpm.sh - name: Create Release and Upload Artifacts uses: ncipollo/release-action@v1.14.0 if: startsWith(github.ref, 'refs/tags/v') with: - artifacts: "artifacts/*,bpftop-*.rpm" + artifacts: "artifacts/bpftop-*" draft: true allowUpdates: true updateOnlyUnreleased: true diff --git a/build-rpm.sh b/build-rpm.sh deleted file mode 100755 index 7f9fa96..0000000 --- a/build-rpm.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -IMAGE_NAME="rpm-builder" -CONTAINER_NAME="rpm-builder-container" -VERSION=$(grep -m 1 '^version =' Cargo.toml | sed 's/version = "\(.*\)"/\1/') - -git archive --format=tar.gz --prefix=bpftop-$VERSION/ -o v${VERSION}.tar.gz HEAD - -cargo vendor - -tar -czf v${VERSION}-vendor.tar.gz vendor - -rm -rf vendor - -echo "Building docker image" -docker build --build-arg VERSION=$VERSION -t $IMAGE_NAME -f dockerfiles/Dockerfile.rpm . - -echo "Running docker container" -docker run --privileged --name $CONTAINER_NAME -d $IMAGE_NAME -c "tail -f /dev/null" - -echo "Building RPM" -docker exec $CONTAINER_NAME mock -r fedora-40-x86_64 --buildsrpm --spec /home/builder/rpmbuild/SPECS/bpftop.spec --sources /home/builder/rpmbuild/SOURCES --resultdir /home/builder/rpmbuild/SRPMS -docker exec $CONTAINER_NAME mock -r fedora-40-x86_64 --rebuild /home/builder/rpmbuild/SRPMS/bpftop-$VERSION-1.fc40.src.rpm --resultdir /home/builder/rpmbuild/RPMS - -echo "Copying RPM to host" -docker cp $CONTAINER_NAME:/home/builder/rpmbuild/RPMS/bpftop-$VERSION-1.fc40.x86_64.rpm . - -echo "Cleaning up" -docker stop $CONTAINER_NAME -docker rm $CONTAINER_NAME \ No newline at end of file diff --git a/dockerfiles/Dockerfile.rpm b/dockerfiles/Dockerfile.rpm deleted file mode 100644 index 2de991b..0000000 --- a/dockerfiles/Dockerfile.rpm +++ /dev/null @@ -1,33 +0,0 @@ -FROM fedora:latest -RUN dnf install -y dnf-plugins-core \ - mock \ - rpm-build \ - rpmdevtools \ - rust2rpm \ - cargo \ - git \ - sudo \ - wget && \ - dnf clean all - -ARG VERSION - -ENV VERSION=$VERSION - -RUN useradd -m builder - -RUN echo 'builder ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/builder - -RUN usermod -a -G mock builder - -USER builder - -WORKDIR /home/builder - -RUN rpmdev-setuptree - -COPY packaging/rpm/bpftop.spec /home/builder/rpmbuild/SPECS/bpftop.spec -COPY v${VERSION}.tar.gz /home/builder/rpmbuild/SOURCES/ -COPY v${VERSION}-vendor.tar.gz /home/builder/rpmbuild/SOURCES/ - -ENTRYPOINT ["/bin/bash"]