diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 9c6623e2..38596da2 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -99,7 +99,7 @@ jobs: run: cd $GITHUB_WORKSPACE/docker_builds/debian_buster && docker build . --tag sdrpp_build - name: Run Container - run: docker run --name build sdrpp_build /root/do_build.sh + run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh - name: Recover Deb Archive working-directory: ${{runner.workspace}} @@ -121,7 +121,7 @@ jobs: run: cd $GITHUB_WORKSPACE/docker_builds/debian_bullseye && docker build . --tag sdrpp_build - name: Run Container - run: docker run --name build sdrpp_build /root/do_build.sh + run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh - name: Recover Deb Archive working-directory: ${{runner.workspace}} @@ -143,7 +143,7 @@ jobs: run: cd $GITHUB_WORKSPACE/docker_builds/debian_sid && docker build . --tag sdrpp_build - name: Run Container - run: docker run --name build sdrpp_build /root/do_build.sh + run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh - name: Recover Deb Archive working-directory: ${{runner.workspace}} @@ -165,7 +165,7 @@ jobs: run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_focal && docker build . --tag sdrpp_build - name: Run Container - run: docker run --name build sdrpp_build /root/do_build.sh + run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh - name: Recover Deb Archive working-directory: ${{runner.workspace}} @@ -187,7 +187,7 @@ jobs: run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_groovy && docker build . --tag sdrpp_build - name: Run Container - run: docker run --name build sdrpp_build /root/do_build.sh + run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh - name: Recover Deb Archive working-directory: ${{runner.workspace}} @@ -209,7 +209,7 @@ jobs: run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_hirsute && docker build . --tag sdrpp_build - name: Run Container - run: docker run --name build sdrpp_build /root/do_build.sh + run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh - name: Recover Deb Archive working-directory: ${{runner.workspace}} @@ -244,4 +244,4 @@ jobs: - uses: actions/upload-artifact@v2 with: name: sdrpp_all - path: sdrpp_all/ \ No newline at end of file + path: sdrpp_all/ diff --git a/make_debian_package.sh b/make_debian_package.sh index a9cc4408..271a8fd7 100644 --- a/make_debian_package.sh +++ b/make_debian_package.sh @@ -8,7 +8,7 @@ mkdir sdrpp_debian_amd64/DEBIAN # Create package info echo Create package info echo Package: sdrpp >> sdrpp_debian_amd64/DEBIAN/control -echo Version: 0.2.5 >> sdrpp_debian_amd64/DEBIAN/control +echo Version: 0.2.5$BUILD_NO >> sdrpp_debian_amd64/DEBIAN/control echo Maintainer: Ryzerth >> sdrpp_debian_amd64/DEBIAN/control echo Architecture: all >> sdrpp_debian_amd64/DEBIAN/control echo Description: Bloat-free SDR receiver software >> sdrpp_debian_amd64/DEBIAN/control @@ -25,4 +25,4 @@ dpkg-deb --build sdrpp_debian_amd64 # Cleanup echo Cleanup -rm -rf sdrpp_debian_amd64 \ No newline at end of file +rm -rf sdrpp_debian_amd64