From 1ffb0ca842d1541c10112189f40d06e95946c750 Mon Sep 17 00:00:00 2001 From: Emil Lerch Date: Mon, 13 Jan 2025 12:41:05 -0800 Subject: [PATCH] change package version format to ignore changes in this repository The previous format made the package screen look a little confusing, as all Chawan versions were there, but the most recent was at the bottom, and using git short hashes would technically force people to go look up the right version from Chawan git log. This process is clearer, but also adds a small risk that a change in this repository that affects the AppImage in some material way gets a skipped build until upstream changes something. We will ignore this risk, and assume that I delete the package manually to reproduce it in the event this happens. --- .gitea/workflows/build-aarch64.yaml | 5 +++-- .gitea/workflows/build.yaml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build-aarch64.yaml b/.gitea/workflows/build-aarch64.yaml index bc24058..d3d05ae 100644 --- a/.gitea/workflows/build-aarch64.yaml +++ b/.gitea/workflows/build-aarch64.yaml @@ -26,10 +26,11 @@ jobs: - name: Get parameters id: vars run: | + shorthash="$(cd chawan && git rev-parse --short HEAD)" echo "upstream=$(cd chawan && git rev-parse HEAD)" | tee -a $GITHUB_OUTPUT - echo "shorthash=$(cd chawan && git rev-parse --short HEAD)" | tee -a $GITHUB_OUTPUT + echo "shorthash=$shorthash" | tee -a $GITHUB_OUTPUT echo "imagename=Chawan-aarch64-$(cd chawan && git rev-parse --short HEAD).AppImage" | tee -a $GITHUB_OUTPUT - echo "packageurl=https://git.lerch.org/api/packages/lobo/generic/chawan-appimage/$(git rev-parse --short HEAD)/Chawan-aarch64-$(cd chawan && git rev-parse --short HEAD).AppImage" | tee -a $GITHUB_OUTPUT + echo "packageurl=https://git.lerch.org/api/packages/lobo/generic/chawan-appimage/${shorthash}/Chawan-aarch64-${shorthash}.AppImage" | tee -a $GITHUB_OUTPUT - name: Check for built package id: package run: | diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a056f20..57fd90f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -21,10 +21,11 @@ jobs: - name: Get parameters id: vars run: | + shorthash="$(cd chawan && git rev-parse --short HEAD)" echo "upstream=$(cd chawan && git rev-parse HEAD)" | tee -a $GITHUB_OUTPUT - echo "shorthash=$(cd chawan && git rev-parse --short HEAD)" | tee -a $GITHUB_OUTPUT + echo "shorthash=$shorthash" | tee -a $GITHUB_OUTPUT echo "imagename=Chawan-x86_64-$(cd chawan && git rev-parse --short HEAD).AppImage" | tee -a $GITHUB_OUTPUT - echo "packageurl=https://git.lerch.org/api/packages/lobo/generic/chawan-appimage/$(git rev-parse --short HEAD)/Chawan-x86_64-$(cd chawan && git rev-parse --short HEAD).AppImage" | tee -a $GITHUB_OUTPUT + echo "packageurl=https://git.lerch.org/api/packages/lobo/generic/chawan-appimage/${shorthash}/Chawan-x86_64-${shorthash}.AppImage" | tee -a $GITHUB_OUTPUT - name: Check for built package id: package run: |