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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2023-12-10 16:35:16 -08:00
parent 841c100a1e
commit d76354c48c
3 changed files with 19 additions and 7 deletions

View file

@ -51,14 +51,20 @@ jobs:
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
bash -x ./subsurface/packaging/android/qmake-build.sh 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) # only publish a 'release' on push events (those include merging a PR)
- name: upload binaries - name: upload binaries
if: github.event_name == 'push' if: github.event_name == 'push'
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
tag_name: ${{ steps.tag.outputs.tag }} tag_name: v${{ steps.date.outputs.today }}.${{ github.run_number }}
prerelease: ${{ steps.tag.outputs.is_latest }} repository: subsurface/nightly-builds
token: ${{ secrets.NIGHTLY_BUILDS }}
prerelease: false
body: CICD release artifact body: CICD release artifact
fail_on_unmatched_files: false fail_on_unmatched_files: true
files: | files: |
Subsurface-mobile*.apk Subsurface-mobile*.apk

View file

@ -42,7 +42,7 @@ jobs:
- name: Get current date - name: Get current date
id: 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) # only publish a 'release' on push events (those include merging a PR)
- name: upload binaries - name: upload binaries

View file

@ -58,15 +58,21 @@ jobs:
bash -x subsurface/.github/workflows/scripts/windows-in-container-build.sh 2>&1 | tee build.log bash -x subsurface/.github/workflows/scripts/windows-in-container-build.sh 2>&1 | tee build.log
grep "Built target installer" 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) # only publish a 'release' on push events (those include merging a PR)
- name: upload binaries - name: upload binaries
if: github.event_name == 'push' if: github.event_name == 'push'
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
tag_name: ${{ steps.tag.outputs.tag }} tag_name: v${{ steps.date.outputs.today }}.${{ github.run_number }}
prerelease: ${{ steps.tag.outputs.is_latest }} repository: subsurface/nightly-builds
token: ${{ secrets.NIGHTLY_BUILDS }}
prerelease: false
body: CICD release artifact body: CICD release artifact
fail_on_unmatched_files: false fail_on_unmatched_files: true
files: | files: |
./subsurface*.exe* ./subsurface*.exe*
./smtk2ssrf*.exe ./smtk2ssrf*.exe