Merge pull request #6 from rhino-linux/0.8.0

0.8.0

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - name: Support
+    url: https://discord.gg/FtNhPepvj7
+    about: Anything that's not a bug report should be asked here.
+  - name: Bug reports
+    url: https://github.com/hwittenborn/celeste/issues/new
+    about: Create a new bug report.

.github/workflows/deploy.yml

@@ -8,20 +8,14 @@ on:
 permissions:
   id-token: write
   contents: read
+
 jobs:
   create-release:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip-ci: create-release')"
     steps:
       - name: Checkout Git repository
         uses: actions/checkout@v3
-      - name: Import Vault secrets
-        uses: hashicorp/vault-action@v2
-        with:
-          url: https://vault.hunterwittenborn.com
-          token: ${{ secrets.VAULT_TOKEN }}
-          secrets: |
-            kv/data/ci github_api_key | GH_TOKEN
       - name: Setup makedeb APT repositories
         uses: makedeb/setup-makedeb@main
         with:
@@ -34,20 +28,15 @@ jobs:
           version="$(just get-version)"
           release_notes="$(parse-changelog CHANGELOG.md "${version}")"
           gh release create "v${version}" --title "v${version}" --target "${GITHUB_SHA}" -n "${release_notes}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_CUSTOM }}
   deploy-mpr:
     runs-on: ubuntu-latest
     needs: [create-release]
     if: "!failure() && !contains(github.event.head_commit.message, 'skip-ci: deploy-mpr')"
     steps:
       - name: Checkout Git repository
         uses: actions/checkout@v3
-      - name: Import Vault secrets
-        uses: hashicorp/vault-action@v2
-        with:
-          url: https://vault.hunterwittenborn.com
-          token: ${{ secrets.VAULT_TOKEN }}
-          secrets: |
-            kv/data/ci ssh_key | SSH_KEY
       - name: Setup makedeb APT repositories
         uses: makedeb/setup-makedeb@main
       - name: Publish MPR package
@@ -85,6 +74,8 @@ jobs:
           git add .
           git commit -m "Bump version to '${pkgver}-${pkgrel}'"
           git push
+        env:
+          SSH_KEY: ${{ secrets.SSH_KEY }}
   deploy-snap:
     runs-on: ubuntu-latest
     needs: [create-release]
@@ -96,13 +87,6 @@ jobs:
         uses: makedeb/setup-makedeb@main
         with:
           pbmpr-repo: true
-      - name: Import Vault secrets
-        uses: hashicorp/vault-action@v2
-        with:
-          url: https://vault.hunterwittenborn.com
-          token: ${{ secrets.VAULT_TOKEN }}
-          secrets: |
-            kv/data/ci snapcraft_store_credentials | SNAPCRAFT_STORE_CREDENTIALS
       - name: Build Celeste Snap
         uses: snapcore/action-build@v1
         id: snapcraft-build
@@ -113,24 +97,19 @@ jobs:
         with:
           snap: ${{ steps.snapcraft-build.outputs.snap }}
           release: stable
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
   deploy-flathub:
     runs-on: ubuntu-latest
     needs: [deploy-snap]
     if: "!failure() && !contains(github.event.head_commit.message, 'skip-ci: deply-flathub')"
     steps:
-      - name: Import Vault secrets
-        uses: hashicorp/vault-action@v2
-        with:
-          url: https://vault.hunterwittenborn.com
-          token: ${{ secrets.VAULT_TOKEN }}
-          secrets: |
-            kv/data/ci github_api_key | GH_TOKEN
       - name: Checkout Flathub Celeste Git repository
         uses: actions/checkout@v3
         with:
           repository: flathub/com.hunterwittenborn.Celeste
           path: com.hunterwittenborn.Celeste
-          token: "${{ env.GH_TOKEN }}"
+          token: ${{ secrets.GH_TOKEN_CUSTOM }}
       - name: Setup makedeb APT repositories
         uses: makedeb/setup-makedeb@main
       - name: Update Flathub package
@@ -153,7 +132,7 @@ jobs:
 
           # Create the PR and wait until we can merge it.
           gh pr create --title "Update package version" --body ''
-          pr_id="$(gh pr list | grep "version/${snap_revision}")"
+          pr_id="$(gh pr list --json headRefName,headRepositoryOwner,number -q ".[] | select((.headRefName==\"version/${snap_revision}\") and .headRepositoryOwner.login==\"flathub\").number")"
 
           while true; do
             comments="$(gh pr view -c)"
@@ -162,10 +141,23 @@ jobs:
               echo "The build failed! Please investigate manually."
               exit 1
             elif echo "${comments}" | grep -q successful; then
+              # Even after a successful build, we have to wait
+              # a bit longer for Buildbot to allow us to merge.
+              status='BLOCKED'
+
+              while [[ "${status}" == 'BLOCKED' ]]; do
+                echo 'Waiting for @flathubbot to allow merging...'
+                sleep 1
+                status="$(gh pr list --json number,mergeStateStatus -q ".[] | select(.number==${pr_id}).mergeStateStatus")"
+              done
+
               echo "The build succeeded! Merging the PR..."
-              gh pr merge "${pr_id}"
+              gh pr merge "${pr_id}" --merge
               exit
             fi
 
             echo "Waiting for @flathubbot to report status checks..."
+            sleep 1
           done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_CUSTOM }}

.github/workflows/test.yml

@@ -5,7 +5,7 @@ jobs:
   run-tests:
     runs-on: ubuntu-latest
     container:
-      image: proget.hunterwittenborn.com/docker/makedeb/makedeb:ubuntu-kinetic
+      image: proget.hunterwittenborn.com/docker/makedeb/makedeb:ubuntu-lunar
       options: --user root
     steps:
       - name: Checkout Git repository

BUILDING.md

@@ -9,7 +9,7 @@ Celeste needs some packages installed in order to build:
 - [rustup](https://rustup.rs/)
 - [Go](https://go.dev/)
 - [just](https://github.com/casey/just)
-- Headers for GTK3, GTK4, Libadwaita, and Libappindicator (The best way I've found to find the needed packages is to try building as described below, and then looking at the output to see what the missing header files are. You can then install the needed packages via your package manager. This process is kind of tedious, but I don't know any other methods at the moment).
+- Headers for GTK4 and Libadwaita (The best way I've found to find the needed packages is to try building as described below, and then looking at the output to see what the missing header files are. You can then install the needed packages via your package manager. This process is kind of tedious, but I don't know any other methods at the moment).
 
 ## Building
 To build the project, run the following from the root of the repository:

CHANGELOG.md

@@ -6,6 +6,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.0] - 2023-10-23
+### Changed
+- Added functionality to only run sync checks when files are changed.
+
+## [0.7.0] - 2023-10-07
+### Changed
+- Remove reliance on GTK3 and libappindicator.
+- Make tray functionality part of main application, instead of being a separate app.
+- Combine all application functionality into a singular crate.
+
+### Fixed
+- Fixed incorrect number of errors being reported in tray.
+- Fixed bug where tray icons would never change.
+
+## [0.6.0] - 2023-10-05
+### Added
+- Added Proton Drive support.
+
+### Fixed
+- Fixed missing `description` tags in metainfo's `releases` section.
+
+## [0.5.8] - 2023-09-16
+### Added
+- Added release notes to about page.
+
+## [0.5.7] - 2023-09-15
+### Fixed
+- Removed duplicate releases in AppStream metadata file.
+
+## [0.5.6] - 2023-09-14
+### Changed
+- Changed to new application icons.
+- Added credits to about page.
+
 ## [0.5.5] - 2023-08-09
 ### Fixed
 - Update `Cargo.toml` and `Cargo.lock` to fix `arm64` compile error.