diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e63bb34..58b58c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: run: | sudo apt-get -y update sudo apt-get -y install tree tshark valgrind - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Configure run: | set -x diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index a7a7240..abb2efb 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -15,8 +15,8 @@ jobs: coverity: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@v3 + - uses: actions/cache@v3 id: coverity-toolchain-cache with: path: cov-analysis-linux64 @@ -53,7 +53,7 @@ jobs: --form description="${PROJECT_NAME} $(git rev-parse HEAD)" \ https://scan.coverity.com/builds?project=${COVERITY_PROJ} - name: Upload build.log - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: coverity-build.log path: cov-int/build-log.txt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14d83cf..e0452a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,38 +7,11 @@ on: jobs: release: - name: Create GitHub release - runs-on: ubuntu-latest - if: startsWith(github.ref, 'refs/tags/') - outputs: - upload_url: ${{ steps.create_release.outputs.upload_url }} - release_id: ${{ steps.create_release.outputs.id }} - steps: - - uses: actions/checkout@v2 - - name: Extract ChangeLog entry ... - # Hack to extract latest entry for body_path below - run: | - awk '/-----*/{if (x == 1) exit; x=1;next}x' ChangeLog.md \ - |head -n -1 > release.md - cat release.md - - name: Create release ... - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: sysklogd ${{ github.ref }} - body_path: release.md - draft: false - prerelease: false - tarball: name: Build and upload release tarball - needs: release if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Installing dependencies ... run: | sudo apt-get -y update @@ -49,14 +22,16 @@ jobs: ./configure --prefix=/tmp --with-systemd=/tmp/lib/systemd/system - name: Build release ... run: | - make release || (cat sysklogd-2.3.0/_build/sub/test/start.log; cat sysklogd-2.3.0/_build/sub/test/remote.log; false) - ls -lF ../ + make release mkdir -p artifacts/ mv ../*.tar.* artifacts/ - - name: Upload release artifacts ... - uses: skx/github-action-publish-binaries@release-0.15 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Extract ChangeLog entry ... + run: | + awk '/-----*/{if (x == 1) exit; x=1;next}x' ChangeLog.md \ + |head -n -1 > release.md + cat release.md + - uses: ncipollo/release-action@v1 with: - releaseId: ${{ needs.release.outputs.release_id }} - args: artifacts/* + name: sysklogd ${{ github.ref_name }} + bodyFile: "release.md" + artifacts: "artifacts/*"