diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8085c6e3a0..6e21debb54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,12 +30,12 @@ jobs: GOPROXY: "https://proxy.golang.org" steps: - - name: "Install packages" + - name: "Install Packages" run: | sudo apt-get update sudo apt-get install -y --no-install-recommends graphviz gnupg2 gpgv2 git gcc make devscripts python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto python3-azure-storage python3-etcd3 python3-plyvel flake8 - - name: "Checkout repository" + - name: "Checkout Repository" uses: actions/checkout@v4 with: # fetch the whole repo for `git describe` to work @@ -45,7 +45,7 @@ jobs: run: | make flake8 - - name: "Read go version from go.mod" + - name: "Read Go Version" run: | gover=$(sed -n 's/^go \(.*\)/\1/p' go.mod) echo "Go Version: $gover" @@ -91,12 +91,12 @@ jobs: sudo mkdir -p /srv ; sudo chown runner /srv COVERAGE_DIR=${{ runner.temp }} make system-test - - name: "Merge code coverage" + - name: "Merge Code Coverage" run: | go install github.com/wadey/gocovmerge@latest ~/go/bin/gocovmerge unit.out ${{ runner.temp }}/*.out > coverage.txt - - name: "Upload code coverage" + - name: "Upload Code Coverage" uses: codecov/codecov-action@v2 with: token: ${{ secrets.CODECOV_TOKEN }} @@ -148,13 +148,13 @@ jobs: gcc-i686-linux-gnu gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: "Checkout repository" + - name: "Checkout Repository" uses: actions/checkout@v4 with: # fetch the whole repo for `git describe` to work fetch-depth: 0 - - name: "Read go version from go.mod" + - name: "Read Go Version" run: | gover=$(sed -n 's/^go \(.*\)/\1/p' go.mod) echo "Go Version: $gover" @@ -200,7 +200,7 @@ jobs: .github/workflows/scripts/upload-artifacts.sh ci ${{ matrix.suite }} - name: "Publish release to aptly" - if: startsWith(github.event.ref, 'refs/tags') && steps.aptlycreds.outputs.FOUND == 'yes' + if: startsWith(github.event.ref, 'refs/tags') && steps.aptlycreds.outputs.FOUND == 'yes' && false env: APTLY_USER: ${{ secrets.APTLY_USER }} APTLY_PASSWORD: ${{ secrets.APTLY_PASSWORD }} @@ -209,7 +209,7 @@ jobs: ci-binary-build: name: "Build" - needs: test + # needs: test runs-on: ubuntu-latest strategy: matrix: @@ -221,13 +221,13 @@ jobs: - goos: darwin goarch: arm steps: - - name: "Checkout repository" + - name: "Checkout Repository" uses: actions/checkout@v4 with: # fetch the whole repo for `git describe` to work fetch-depth: 0 - - name: "Read go version from go.mod" + - name: "Read Go Version" run: | echo "GOVER=$(sed -n 's/^go \(.*\)/\1/p' go.mod)" >> $GITHUB_OUTPUT id: goversion @@ -274,12 +274,22 @@ jobs: needs: ci-binary-build if: startsWith(github.event.ref, 'refs/tags') steps: + - name: "Checkout Repository" + uses: actions/checkout@v4 + - name: "Download Artifacts" uses: actions/download-artifact@v4 with: path: out/ + - name: "Create Release Notes" + run: | + echo -e "## Changes\n\n" > out/release-notes.md + dpkg-parsechangelog -S Changes | tail -n +4 >> out/release-notes.md + - name: "Release" uses: softprops/action-gh-release@v2 with: + name: "Aptly Release ${{ github.ref_name }}" files: "out/**/aptly_*.zip" + body_path: "out/release-notes.md" diff --git a/Releasing.md b/Releasing.md index 81156b7af4..459c0d0b02 100644 --- a/Releasing.md +++ b/Releasing.md @@ -3,13 +3,14 @@ - create branch release/1.x.y - update debian/changelog - create PR, merge when approved -- on updated master, git tag and push: +- on updated master, create release: ``` version=$(dpkg-parsechangelog -S Version) + echo Releasing prod version $version git tag -a v$version -m 'aptly: release $version' - git push aptly-dev v$version + git push origin v$version master ``` -- run swagger locally -- add generated swagger-1.x.y.json to www.aptly.info +- run swagger locally (`make docker-serve`) +- copy generated docs/swagger.json to https://github.com/aptly-dev/www.aptly.info/tree/master/static/swagger/aptly_1.x.y.json - releae www.aptly.info - create release announcement on https://github.com/aptly-dev/aptly/discussions