From a31e0d66c63668afdf3ae18ad52ab9651f008a9b Mon Sep 17 00:00:00 2001 From: Martin Simon Date: Mon, 30 Aug 2021 04:55:10 +0200 Subject: [PATCH] new release --- .github/workflows/main.yml | 55 +++++++++++++++----------------------- build.sh | 2 +- debian/changelog | 8 ++++++ debian/compat | 2 +- debian/control | 4 +-- entrypoint.sh | 5 ---- 6 files changed, 33 insertions(+), 43 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e18bca..f692bb3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,53 +1,40 @@ -name: Build alacritty Debian packages +name: Build and release packages on: push: tags: - - "*" + - '*' + +env: + DEBIAN_STABLE: bullseye + PKG_NAME: alacritty jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - name: Checkout + uses: actions/checkout@v2 + - name: Build packages run: | set -xe mkdir -p assets - ./build.sh -i debian:buster-slim - rename.ul .deb _debian_buster.deb target/alacritty_*.deb - mv -n target/alacritty_*.deb assets/ + ./build.sh -i debian:${{ env.DEBIAN_STABLE }}-slim + rename.ul .deb _${{ env.DEBIAN_STABLE }}.deb target/${{ env.PKG_NAME }}_*.deb + mv -n target/${{ env.PKG_NAME }}_*.deb assets/ ./build.sh -i debian:testing-slim - rename.ul .deb _debian_testing.deb target/alacritty_*.deb - mv -n target/alacritty_*.deb assets/ + rename.ul .deb _testing.deb target/${{ env.PKG_NAME }}_*.deb + mv -n target/${{ env.PKG_NAME }}_*.deb assets/ ./build.sh -i debian:unstable-slim - rename.ul .deb _debian_unstable.deb target/alacritty_*.deb - mv -n target/alacritty_*.deb assets/ - - name: Create release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + rename.ul .deb _unstable.deb target/${{ env.PKG_NAME }}_*.deb + mv -n target/${{ env.PKG_NAME }}_*.deb assets/ + + - name: Build packages + uses: "marvinpinto/action-automatic-releases@v1.2.1" with: - tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} - draft: false + repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false - - name: Upload packages - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ID: ${{ steps.create_release.outputs.id }} - run: | - set -xe - for asset in assets/* - do - UPLOAD_URL="https://uploads.github.com/repos/$GITHUB_REPOSITORY/releases/$ID/assets" - curl \ - -X POST \ - -H "Authorization: token $GITHUB_TOKEN" \ - -H "Content-Type: application/octet-stream" \ - --data-binary @"$asset" \ - "${UPLOAD_URL}?name=$(basename $asset)" - done + files: assets/*.deb diff --git a/build.sh b/build.sh index bb735d2..87462ba 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ set -eu -IMAGE="debian:buster-slim" +IMAGE="debian:bullseye-slim" TARGET="$(dirname "$0" | xargs realpath)" VERSION="v0.9.0" diff --git a/debian/changelog b/debian/changelog index a058bb5..52b3dd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +alacritty (0.9.0-2) unstable; urgency=medium + + * Bullseye is now stable + * Update debhelper + * Improve Debian version and package name handling in Github Action + + -- Martin Simon Tue, 03 Aug 2021 00:00:00 +0000 + alacritty (0.9.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/compat b/debian/compat index b4de394..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/control b/debian/control index 0aab6ba..a7f7cb6 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Martin Simon Build-Depends: cargo:native, - debhelper (>= 11), + debhelper (>= 12), help2man, libfreetype6-dev, libfontconfig1-dev, @@ -15,7 +15,7 @@ Build-Depends: libxkbcommon-dev, rustc:native, python3, -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Homepage: https://github.com/alacritty/alacritty Package: alacritty diff --git a/entrypoint.sh b/entrypoint.sh index bd74fd5..739c493 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -12,11 +12,6 @@ export DEBIAN_FRONTEND DEB_BUILD_OPTIONS dependencies() { apt update && apt install -y devscripts equivs git - if [ "$OS_VERSION" = 10 ]; then - apt install -y curl - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - . ~/.cargo/env - fi } get_sources() {