From f58d21d8eed67f41e4a74482c4319cd9ae58d3fd Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 3 Feb 2025 22:20:47 +0900 Subject: [PATCH] FLATHUB: rerouting artiacts on our new Artifacts repo --- .github/workflows/build_retrodeck.yml | 30 ++++++++++++++++++++++++++- automation_tools/flathub_push_main.sh | 4 ++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_retrodeck.yml b/.github/workflows/build_retrodeck.yml index a1311e98..e2244481 100644 --- a/.github/workflows/build_retrodeck.yml +++ b/.github/workflows/build_retrodeck.yml @@ -278,6 +278,19 @@ jobs: - name: Create Bundle run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_bundle.sh" + # TODO: Until we add support for Flathub-beta this is restricted to main + - name: Create Artifact for Flathub + if: github.ref == 'refs/heads/main' + run: | + if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then + artifact_name="RetroDECK-Artifact" + else + artifact_name="RetroDECK-Artifact-cooker" + fi + tar -czf ${GITHUB_WORKSPACE}/${artifact_name}.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker . + hash=($(sha256sum ${GITHUB_WORKSPACE}/${artifact_name}.tar.gz)) + echo $hash > ${GITHUB_WORKSPACE}/${artifact_name}.sha + # Upload artifacts for other jobs - name: Upload Build Artifacts uses: actions/upload-artifact@v4 @@ -287,7 +300,8 @@ jobs: path: | RetroDECK*.flatpak RetroDECK*.flatpak.sha - RetroDECK*Artifact.tar.gz + RetroDECK-Artifact*.tar.gz + RetroDECK-Artifact*.sha GitHub-publish: runs-on: ubuntu-latest @@ -334,6 +348,20 @@ jobs: repo: ${{ env.REPO_NAME }} token: ${{ steps.generate-rekku-token.outputs.token }} + # Publish Artifacts + - name: Publish Artifacts + uses: ncipollo/release-action@v1 + with: + tag: ${{ env.TAG }} + name: "RetroDECK Artifacts - ${{ env.TAG }}" + body: "Flathub artifacts for version ${{ env.TAG }}" + artifacts: "retrodeck-artifacts/RetroDECK-Artifact*.tar.gz,retrodeck-artifacts/RetroDECK-Artifact*.sha" + allowUpdates: true + omitBodyDuringUpdate: true + makeLatest: ${{ env.MAKE_LATEST }} + repo: Artifacts + token: ${{ steps.generate-rekku-token.outputs.token }} + - name: Post PR comment with artifacts if: github.event_name == 'pull_request_target' || github.event_name == 'pull_request' uses: marocchino/sticky-pull-request-comment@v2 diff --git a/automation_tools/flathub_push_main.sh b/automation_tools/flathub_push_main.sh index 2a398c5f..bb2ee12f 100755 --- a/automation_tools/flathub_push_main.sh +++ b/automation_tools/flathub_push_main.sh @@ -13,8 +13,8 @@ fi rd_branch="main" flathub_target_repo='flathub/net.retrodeck.retrodeck' retrodeck_repo='RetroDECK/RetroDECK' -artifacts_sha_link="https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.sha" -artifacts_link="https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.tar.gz" +artifacts_sha_link=$(curl -s https://api.github.com/repos/RetroDECK/Artifacts/releases/latest | jq -r '.assets[] | select(.name == "RetroDECK-Artifacts.sha").browser_download_url') +artifacts_link=$(curl -s https://api.github.com/repos/RetroDECK/Artifacts/releases/latest | jq -r '.assets[] | select(.name == "RetroDECK-Artifacts.tar.gz").browser_download_url') if -d "$gits_folder"; then rm -rf "$gits_folder"