From 0e35777d9cab5342f690c1572f6bc2b1500dda7a Mon Sep 17 00:00:00 2001 From: florianvazelle Date: Sun, 3 Dec 2023 12:38:51 +0100 Subject: [PATCH] ci: publish only to the stable channel for snap --- .env | 2 +- .github/workflows/snapcraft-build.yaml | 15 --------------- CHANGELOG.md | 13 ++++++++++++- Justfile | 3 ++- export_presets.cfg | 6 +++--- .../packaging/org.mechanicalflower.Marble.desktop | 2 +- public/packaging/snap/snapcraft.yaml | 10 +++++----- 7 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.env b/.env index d9580d2..47fdf8f 100644 --- a/.env +++ b/.env @@ -7,5 +7,5 @@ GODOT_VERSION=4.2 # Game GAME_NAME=Marble -GAME_VERSION=1.4.3 +GAME_VERSION=1.4.4 GAME_ITCHIO_KEY=marble diff --git a/.github/workflows/snapcraft-build.yaml b/.github/workflows/snapcraft-build.yaml index d91983c..ef26b10 100644 --- a/.github/workflows/snapcraft-build.yaml +++ b/.github/workflows/snapcraft-build.yaml @@ -22,21 +22,6 @@ jobs: path: public/packaging id: snapcraft - # Push, on each commit of the main branch, to the edge channel - - uses: snapcore/action-publish@v1 - if: github.ref == 'refs/heads/main' - env: - SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }} - with: - snap: ${{ steps.snapcraft.outputs.snap }} - release: edge - - - name: Update the snapcraft to be stable - if: startsWith(github.ref, 'refs/tags/') - run: | - sed -i "s,grade:\ devel$,grade:\ stable\",g" ./public/packaging/snap/snapcraft.yaml - sed -i "s,confinement:\ devmode$,confinement:\ strict,g" ./public/packaging/snap/snapcraft.yaml - # Push, on each tag, to the stable channel - uses: snapcore/action-publish@v1 if: startsWith(github.ref, 'refs/tags/') diff --git a/CHANGELOG.md b/CHANGELOG.md index b3815c7..2df4ddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,16 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Security ### Dependencies +## [1.4.4] +### Added +### Changed +### Deprecated +### Removed +### Fixed +- Publish only to the stable channel for snap ([#25](https://github.com/MechanicalFlower/Marble/pull/25)) +### Security +### Dependencies + ## [1.4.3] ### Added - Add web deploy ([#20](https://github.com/MechanicalFlower/Marble/pull/20)) @@ -35,6 +45,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bump `ubuntu` from v20 to v22 ([#15](https://github.com/MechanicalFlower/Marble/pull/15)) - Bump `kobewi/godot-universal-fade` from ddab6c2 to f091514 ([#12](https://github.com/MechanicalFlower/Marble/pull/12)) -[Unreleased]: https://github.com/MechanicalFlower/Marble/compare/1.4.2...HEAD +[Unreleased]: https://github.com/MechanicalFlower/Marble/compare/1.4.4...HEAD +[1.4.4]: https://github.com/MechanicalFlower/Marble/compare/1.4.3...1.4.4 [1.4.3]: https://github.com/MechanicalFlower/Marble/compare/1.4.2...1.4.3 [1.4.2]: https://github.com/MechanicalFlower/Marble/compare/1.4.1...1.4.2 diff --git a/Justfile b/Justfile index 84f44d5..7d23305 100644 --- a/Justfile +++ b/Justfile @@ -146,7 +146,8 @@ editor: # Run files formatters fmt: just venv pip install pre-commit==3.3.3 reuse==2.1.0 gdtoolkit==4.* - just venv pre-commit run -a + # Retry multiple times, sometimes in CI, gdlint raise "file exists" + retry=1; until just venv pre-commit run -a; do if (($retry==3)); then exit 1; else sleep $((retry++)); fi; done; # Export game on Windows export-windows: bump-version install-addons import-resources diff --git a/export_presets.cfg b/export_presets.cfg index b9e8e1f..a19db53 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -35,8 +35,8 @@ application/modify_resources=true application/icon="" application/console_wrapper_icon="" application/icon_interpolation=4 -application/file_version="1.4.3.20231203" -application/product_version="1.4.3.20231203" +application/file_version="1.4.4.20231203" +application/product_version="1.4.4.20231203" application/company_name="Mechanical Flower" application/product_name="Marble" application/file_description="" @@ -131,7 +131,7 @@ application/bundle_identifier="io.itch.MechanicalFlower" application/signature="" application/app_category="Games" application/short_version="1.4" -application/version="1.4.3" +application/version="1.4.4" application/copyright="2023-present Mechanical Flower" application/copyright_localized={} application/min_macos_version="10.12" diff --git a/public/packaging/org.mechanicalflower.Marble.desktop b/public/packaging/org.mechanicalflower.Marble.desktop index df30367..42edeaa 100644 --- a/public/packaging/org.mechanicalflower.Marble.desktop +++ b/public/packaging/org.mechanicalflower.Marble.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Version=1.4.3 +Version=1.4.4 Type=Application Name=Marble diff --git a/public/packaging/snap/snapcraft.yaml b/public/packaging/snap/snapcraft.yaml index e7c9ba6..1b4898a 100644 --- a/public/packaging/snap/snapcraft.yaml +++ b/public/packaging/snap/snapcraft.yaml @@ -2,12 +2,12 @@ --- name: marble-race base: core20 -version: '1.4.3' +version: '1.4.4' summary: A marble race minigame description: | A marble race minigame, made with Godot Engine. -grade: devel -confinement: devmode +grade: stable +confinement: strict license: MIT architectures: [amd64] @@ -25,7 +25,7 @@ apps: parts: marble-source: - source: https://github.com/MechanicalFlower/Marble/archive/refs/tags/1.4.3.tar.gz + source: https://github.com/MechanicalFlower/Marble/archive/refs/tags/1.4.4.tar.gz override-build: | snapcraftctl build @@ -40,7 +40,7 @@ parts: mkdir -p ${SNAPCRAFT_PRIME}/gui cp ${SNAPCRAFT_PART_SRC}/assets/icon.png ${SNAPCRAFT_PRIME}/gui/icon.png marble-dist: - source: https://github.com/MechanicalFlower/Marble/releases/download/1.4.3/Marble-linux-v1.4.3.zip + source: https://github.com/MechanicalFlower/Marble/releases/download/1.4.4/Marble-linux-v1.4.4.zip override-build: | snapcraftctl build