Skip to content

Commit

Permalink
ci: publish only to the stable channel for snap
Browse files Browse the repository at this point in the history
  • Loading branch information
florianvazelle committed Dec 3, 2023
1 parent dae2365 commit 0e35777
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 0 additions & 15 deletions .github/workflows/snapcraft-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/')
Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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
3 changes: 2 additions & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion public/packaging/org.mechanicalflower.Marble.desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[Desktop Entry]
Version=1.4.3
Version=1.4.4
Type=Application

Name=Marble
Expand Down
10 changes: 5 additions & 5 deletions public/packaging/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 0e35777

Please sign in to comment.