From d76354c48c342a185225cccc81ad29a04653dfe9 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 10 Dec 2023 16:35:16 -0800 Subject: [PATCH] switch Android and Windows to do nightly builds This way our ongoing releases will be in their own repo. Also, use a nicer date format (at least I think this looks nicer). Signed-off-by: Dirk Hohndel --- .github/workflows/android.yml | 12 +++++++++--- .github/workflows/mac.yml | 2 +- .github/workflows/windows.yml | 12 +++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 73e8d5b9f..1017d2104 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -51,14 +51,20 @@ jobs: git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer bash -x ./subsurface/packaging/android/qmake-build.sh + - name: Get current date + id: date + run: echo "today=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT + # only publish a 'release' on push events (those include merging a PR) - name: upload binaries if: github.event_name == 'push' uses: softprops/action-gh-release@v1 with: - tag_name: ${{ steps.tag.outputs.tag }} - prerelease: ${{ steps.tag.outputs.is_latest }} + tag_name: v${{ steps.date.outputs.today }}.${{ github.run_number }} + repository: subsurface/nightly-builds + token: ${{ secrets.NIGHTLY_BUILDS }} + prerelease: false body: CICD release artifact - fail_on_unmatched_files: false + fail_on_unmatched_files: true files: | Subsurface-mobile*.apk diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 6c7a4d47c..9587fbffb 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -42,7 +42,7 @@ jobs: - name: Get current date id: date - run: echo "today=$(date '+%Y%m%d')" >> $GITHUB_OUTPUT + run: echo "today=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT # only publish a 'release' on push events (those include merging a PR) - name: upload binaries diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a69c7fcab..74bdf469c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -58,15 +58,21 @@ jobs: bash -x subsurface/.github/workflows/scripts/windows-in-container-build.sh 2>&1 | tee build.log grep "Built target installer" build.log + - name: Get current date + id: date + run: echo "today=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT + # only publish a 'release' on push events (those include merging a PR) - name: upload binaries if: github.event_name == 'push' uses: softprops/action-gh-release@v1 with: - tag_name: ${{ steps.tag.outputs.tag }} - prerelease: ${{ steps.tag.outputs.is_latest }} + tag_name: v${{ steps.date.outputs.today }}.${{ github.run_number }} + repository: subsurface/nightly-builds + token: ${{ secrets.NIGHTLY_BUILDS }} + prerelease: false body: CICD release artifact - fail_on_unmatched_files: false + fail_on_unmatched_files: true files: | ./subsurface*.exe* ./smtk2ssrf*.exe