From d3e8f9235622127a714f86eb8cb529bfdb195410 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sat, 4 Jan 2025 19:22:59 +0000 Subject: [PATCH] chore: Add update-check to the CI smoke test. We run this for all our release binaries. --- .../{version-regex.sh => smoke-test.sh} | 7 +++++-- .github/workflows/build-test-deploy.yaml | 21 ++++--------------- 2 files changed, 9 insertions(+), 19 deletions(-) rename .ci-scripts/{version-regex.sh => smoke-test.sh} (71%) diff --git a/.ci-scripts/version-regex.sh b/.ci-scripts/smoke-test.sh similarity index 71% rename from .ci-scripts/version-regex.sh rename to .ci-scripts/smoke-test.sh index 075fdf5b3f..c02dcbddf3 100755 --- a/.ci-scripts/version-regex.sh +++ b/.ci-scripts/smoke-test.sh @@ -8,7 +8,10 @@ set -eux -o pipefail if [ -n "$(echo "$GITHUB_REF" | grep -o 'refs/tags/v.*')" ] || [ -n "$(git tag --points-at HEAD | grep '^v.*')" ] || [ -n "$(git log -1 --pretty=%B | grep '^chore: Release v.*')" ]; then - echo "regex=qTox v.* (stable)" >>"$GITHUB_OUTPUT" + REGEX="qTox v.* (stable)" else - echo "regex=qTox v.* (unstable)" >>"$GITHUB_OUTPUT" + REGEX="qTox v.* (unstable)" fi + +"$@" --version | grep '${{ steps.expectation.outputs.regex }}' || ("$@" --version && false) +"$@" --update-check diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 2c0820d6ee..50aa46d03d 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -322,13 +322,10 @@ jobs: name: qTox-${{ github.sha }}-x86_64-AppImage - name: Install AppImage dependencies run: sudo apt-get install -y fuse xvfb - - name: Determine whether we expect to be stable - id: expectation - run: .ci-scripts/version-regex.sh - name: Run AppImage run: | chmod +x qTox-*.AppImage - xvfb-run --auto-servernum ./qTox-*.AppImage --version | grep '${{ steps.expectation.outputs.regex }}' || (xvfb-run --auto-servernum ./qTox-*.AppImage --version && false) + .ci-scripts/smoke-test.sh xvfb-run --auto-servernum ./qTox-*.AppImage build-android: name: Android @@ -504,11 +501,8 @@ jobs: flatpak install --user -y --noninteractive flathub org.kde.Platform/x86_64/6.7 - name: Install flatpak run: flatpak install --user -y --bundle qtox.flatpak - - name: Determine whether we expect to be stable - id: expectation - run: .ci-scripts/version-regex.sh - name: Run flatpak - run: flatpak run io.github.qtox.qTox --version | grep '${{ steps.expectation.outputs.regex }}' || (flatpak run io.github.qtox.qTox --version && false) + run: .ci-scripts/smoke-test.sh flatpak run io.github.qtox.qTox env: QT_QPA_PLATFORM: offscreen @@ -626,11 +620,8 @@ jobs: run: brew install 7zip - name: Unpack dmg run: 7zz x qTox.dmg qtox.app - - name: Determine whether we expect to be stable - id: expectation - run: .ci-scripts/version-regex.sh - name: Run qTox - run: qtox.app/Contents/MacOS/qTox --version | grep '${{ steps.expectation.outputs.regex }}' || (qtox.app/Contents/MacOS/qTox --version && false) + run: .ci-scripts/smoke-test.sh qtox.app/Contents/MacOS/qTox build-macos-user: name: macOS user @@ -767,13 +758,9 @@ jobs: run: choco install -y 7zip - name: Unpack exe run: 7z x setup-qtox.exe -oqtox - - name: Determine whether we expect to be stable - id: expectation - shell: bash - run: .ci-scripts/version-regex.sh - name: Run qTox shell: bash - run: qtox/bin/qtox.exe --version | grep '${{ steps.expectation.outputs.regex }}' || (qtox/bin/qtox.exe --version && false) + run: .ci-scripts/smoke-test.sh qtox/bin/qtox.exe ################################################################################################ # Documentation/website jobs