diff --git a/.github/workflows/build_es-de.yml b/.github/workflows/build_es-de.yml index 35dad23d4..07b797a60 100644 --- a/.github/workflows/build_es-de.yml +++ b/.github/workflows/build_es-de.yml @@ -4,26 +4,21 @@ on: push: branches: - retrodeck-main + - main - feat/* workflow_dispatch: - jobs: - Building_RetroDECK-ES-DE: runs-on: ubuntu-latest steps: - # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317 - # - name: Remove stuck mounts - # run: sudo umount -f /home/ubuntu/es-de-runner/_work/RetroDECK-ES-DE/RetroDECK-ES-DE/.flatpak-builder/rofiles/* - # continue-on-error: true - - - name: Clone repo + - name: Clone RetroDECK repo uses: actions/checkout@v3 with: - submodules: 'true' + submodules: 'recursive' token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + fetch-depth: 1 - name: "Install dependencies" run: "automation_tools/install_dependencies.sh" @@ -84,24 +79,33 @@ jobs: token: ${{ secrets.TRIGGER_BUILD_TOKEN }} continue-on-error: true - # - name: "Committing changes" - # with: - # github_token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + # - name: Clone Cooker repo + # if: contains(env.BRANCH_NAME, 'feat/') == false + # uses: actions/checkout@v3 + # with: + # repository: RetroDECK/RetroDECK + # #ref: cooker + # ref: feat/lighter-manifest # TODO: put cooker when this is merged + # submodules: 'recursive' + # token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + # path: cooker + + # - name: "Update RetroDECK Cooker manifest with new artifact URL and SHA256" + # if: contains(env.BRANCH_NAME, 'feat/') == false # run: | + # NEW_URL="https://github.com/RetroDECK/ES-DE/releases/download/${{env.BRANCH_NAME}}-${{env.DATE}}/RetroDECK-ES-DE-Artifact.tar.gz" + # NEW_SHA256=$(cat ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha) + + # yq e -i '.modules[] | select(.name == "ES-DE") | .sources[0].url = strenv(NEW_URL)' cooker/net.retrodeck.retrodeck.yml + # yq e -i '.modules[] | select(.name == "ES-DE") | .sources[0].sha256 = strenv(NEW_SHA256)' cooker/net.retrodeck.retrodeck.yml + + # - name: Commit and push changes to Cooker repo + # if: contains(env.BRANCH_NAME, 'feat/') == false + # run: | + # cd "${GITHUB_WORKSPACE}/cooker" # git config user.name "GitHub Actions" # git config user.email "actions@github.com" - # git add * net.retrodeck.es-de.yml - # git commit -m '[AUTOMATED] Updating ES-DE after build [skip ci]' - # git push origin main - # continue-on-error: true # TODO: would be good to update the manifest but it's broken - - # - name: GitHub Commit & Push - # uses: actions-js/push@v1.4 - # with: - # github_token: ${{ secrets.TRIGGER_BUILD_TOKEN }} - # message: '[AUTOMATED] Updating ES-DE after build [skip ci]' - # branch: retrodeck-main - # continue-on-error: true # TODO: would be good to update the manifest but it's broken - - + # git add net.retrodeck.retrodeck.yml + # git commit -m "ES-DE: updated module with new artifact URL and SHA256 [skip ci]" + # git push origin HEAD diff --git a/resources/systems/linux/es_find_rules.xml b/resources/systems/linux/es_find_rules.xml index 2223f0d27..e26979190 100644 --- a/resources/systems/linux/es_find_rules.xml +++ b/resources/systems/linux/es_find_rules.xml @@ -810,6 +810,7 @@ ruffle + /app/bin/ruffle-wrapper.sh ~/Applications/ruffle/ruffle ~/.local/share/applications/ruffle/ruffle ~/.local/bin/ruffle/ruffle diff --git a/resources/systems/linux/es_systems.xml b/resources/systems/linux/es_systems.xml index d8392e94b..db5a03b9a 100644 --- a/resources/systems/linux/es_systems.xml +++ b/resources/systems/linux/es_systems.xml @@ -686,18 +686,18 @@ fds fds - flash flash ---> + fm7 Fujitsu FM-7