From 62010aafd4014c19d4d0cf36f01d3c53b43c5e7b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Apr 2024 10:14:45 +0200 Subject: Merging upstream version 1.7.7. Signed-off-by: Daniel Baumann --- .github/workflows/release.yml | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) (limited to '.github/workflows/release.yml') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9500cee..d5d2b25 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,36 +2,26 @@ name: release on: push: - tags: - - "*" + tags: ["*"] jobs: build: - runs-on: ubuntu-20.04 - strategy: - fail-fast: false - matrix: - target: [i686, x86_64, arm, armhf, aarch64, mips, mipsel, mips64, mips64el, s390x, win32] - steps: - - uses: actions/checkout@v3 - - name: Install packages - run: | - sudo apt-get update - sudo apt-get install -y autoconf automake build-essential cmake curl file libtool - - name: Cross build (${{ matrix.target }}) - env: - BUILD_TARGET: ${{ matrix.target }} - run: ./scripts/cross-build.sh - - uses: actions/upload-artifact@v3 - with: - name: ttyd.${{ matrix.target }} - path: build/ttyd* + uses: ./.github/workflows/backend.yml publish: needs: [build] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 + - uses: actions/checkout@v4 + - name: Check version bump + run: | + TAG=$(git describe --tags --match "[0-9]*.[0-9]*.[0-9]*" --abbrev=8) + VERSION=$(grep project CMakeLists.txt| awk '{print $3}') + if [ "$TAG" != "$VERSION" ]; then + echo "=== Version in CMakeLists.txt and git tag does not match!" + echo "=== Git Tag: $TAG, Version: $VERSION" + exit 1 + fi + - uses: actions/download-artifact@v4 - run: | mkdir build for file in ttyd.*/*; do @@ -39,6 +29,7 @@ jobs: [[ $file == *.exe ]] && target="$target.exe" mv $file build/$target done + pushd build; sha256sum ttyd.* > SHA256SUMS; popd - uses: ncipollo/release-action@v1 with: artifacts: build/* -- cgit v1.2.3