Revert "PANCAKES: trying to store the token for the clone - troubleshooting"

This reverts commit 66836d5b7d.
This commit is contained in:
XargonWan 2024-12-01 00:00:59 +09:00
parent 66836d5b7d
commit aca61884df
3 changed files with 7 additions and 18 deletions

View file

@ -196,22 +196,23 @@ jobs:
- name: "Build flatpak: download only" - name: "Build flatpak: download only"
id: flatpak-download id: flatpak-download
run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh" run: |
env: git config --global credential.helper store
GITHUB_TOKEN: ${{ steps.generate-rekku-token.outputs.token }} echo "https://${{ steps.generate-rekku-token.outputs.token }}@github.com" > ~/.git-credentials
"${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
# Sometimes flatpak download fails, in this case it tries a second time # Sometimes flatpak download fails, in this case it tries a second time
- name: "Build flatpak: download only (retry)" - name: "Build flatpak: download only (retry)"
if: steps.flatpak-download.outcome == 'failure' if: steps.flatpak-download.outcome == 'failure'
run: | run: |
git config --global credential.helper store
echo "https://${{ steps.generate-rekku-token.outputs.token }}@github.com" > ~/.git-credentials
echo "Download failed, maybe some hash changed since the build start." echo "Download failed, maybe some hash changed since the build start."
echo "Recalculating hashes and retrying download..." echo "Recalculating hashes and retrying download..."
rm -f "{GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml" rm -f "{GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml"
cp "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak" "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml" cp "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak" "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml"
"${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" "${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
"${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh" "${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh"
env:
GITHUB_TOKEN: ${{ steps.generate-rekku-token.outputs.token }}
- name: Build flatpak - name: Build flatpak
run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh" run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh"

View file

@ -4,16 +4,6 @@
git config --global protocol.file.allow always git config --global protocol.file.allow always
# Getting token from env
TOKEN=$GITHUB_TOKEN
export GIT_CURL_VERBOSE=1
export GIT_ASKPASS=echo
export GIT_USERNAME=token
export GIT_PASSWORD=$TOKEN
sed -i "s|Authorization: token .*|Authorization: token ${TOKEN}|" "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml"
if [[ "${GITHUB_REF##*/}" == "main" ]]; then if [[ "${GITHUB_REF##*/}" == "main" ]]; then
BUNDLE_NAME="RetroDECK.flatpak" BUNDLE_NAME="RetroDECK.flatpak"
FOLDER=retrodeck-flatpak FOLDER=retrodeck-flatpak

View file

@ -570,11 +570,9 @@ modules:
- mkdir -p "${FLATPAK_DEST}/retrodeck/licenses" - mkdir -p "${FLATPAK_DEST}/retrodeck/licenses"
- mv LICENSE.txt "${FLATPAK_DEST}/retrodeck/licenses" - mv LICENSE.txt "${FLATPAK_DEST}/retrodeck/licenses"
sources: sources:
- type: archive - type: file
url: https://github.com/RetroDECK/Pancakes/releases/download/1.1.0.1403/pancakes-Release-linux_x64.tar.gz url: https://github.com/RetroDECK/Pancakes/releases/download/1.1.0.1403/pancakes-Release-linux_x64.tar.gz
sha256: cc7d25b6a2f2ad16533e3d72ba9477a4d77b8cfbb450f0db3d0c05ffde5e1281 sha256: cc7d25b6a2f2ad16533e3d72ba9477a4d77b8cfbb450f0db3d0c05ffde5e1281
x-extra-headers:
- "Authorization: token ${GITHUB_TOKEN}"
# XEMU # XEMU
# https://xemu.app/docs/download/#download-for-linux # https://xemu.app/docs/download/#download-for-linux