Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-22 14:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/cooker-0.7.2b' into cooker-0.7.2b-icenine451

Browse source
This commit is contained in:
icenine451 2023-08-30 12:01:27 -04:00
parent 221159eaeb 88996afd08
commit 309fd609cf
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/cooker-selfhosted.yml vendored
View file

@ -6,8 +6,10 @@ on:
- cooker* - cooker*
paths: paths:
- '.github/workflows/**' - '.github/workflows/**'
- 'automation_tools'
- 'emu-configs/**' - 'emu-configs/**'
- 'es-configs/**' - 'es-configs/**'
- 'functions'
- 'rd-submodules/**' - 'rd-submodules/**'
- '*.sh' - '*.sh'
- 'net.retrodeck.retrodeck.yml' - 'net.retrodeck.retrodeck.yml'
@ -51,7 +53,8 @@ jobs:
- name: Run pre-build automation tasks - name: Run pre-build automation tasks
run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
- name: Setting branch in the manifest # remove me when the automations tool substitution can do this
- name: Set branch in the manifest
run: | run: |
sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml
echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)"

9
.github/workflows/main-selfhosted.yml vendored
View file

@ -6,8 +6,10 @@ on:
- main - main
paths: paths:
- '.github/workflows/**' - '.github/workflows/**'
- 'automation_tools'
- 'emu-configs/**' - 'emu-configs/**'
- 'es-configs/**' - 'es-configs/**'
- 'functions'
- 'rd-submodules/**' - 'rd-submodules/**'
- '*.sh' - '*.sh'
- 'net.retrodeck.retrodeck.yml' - 'net.retrodeck.retrodeck.yml'
@ -43,10 +45,11 @@ jobs:
- name: Run pre-build automation tasks - name: Run pre-build automation tasks
run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh"
# remove me when the automations tool substitution can do this
- name: Set branch in the manifest - name: Set branch in the manifest
run: | run: |
sed -i "s/branch: THISBRANCH/branch: $(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml sed -i "s/THISBRANCH/$(git rev-parse --abbrev-ref HEAD)/g" net.retrodeck.retrodeck.yml
echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)" echo "Branch name is: $(git rev-parse --abbrev-ref HEAD)"
- name: Read manifest content - name: Read manifest content
id: read_manifest id: read_manifest
@ -55,7 +58,7 @@ jobs:
- name: Check VERSION - name: Check VERSION
id: check_version_string id: check_version_string
run: | run: |
if [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=THISBRANCH"* ]]; then if [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=THISBRANCH"* ]] || [[ "${{ steps.read_file.outputs.file_content }}" == *"VERSION=main"* ]]; then
echo "Version string is present, proceeding." echo "Version string is present, proceeding."
else else
echo "Error: You forgot to specify the version." echo "Error: You forgot to specify the version."

4
net.retrodeck.retrodeck.yml
View file

@ -66,15 +66,15 @@ modules:
# The version number is hardcoded in /app/retrodeck/version # The version number is hardcoded in /app/retrodeck/version
# #
# UPDATE STEPS FOR MAIN: # UPDATE STEPS FOR MAIN:
# [ ] Update the VERSION variable # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH"
# [ ] Update the appdata.xml with the version number and notes # [ ] Update the appdata.xml with the version number and notes
# [ ] if header (before modules) was edited, edit it even in flathub.yml
# #
- name: version-initialization - name: version-initialization
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- | - |
# on main please update this with the version variable, eg: VERSION='0.7.0b'
VERSION=THISBRANCH VERSION=THISBRANCH
git checkout ${GITHUB_REF_NAME} git checkout ${GITHUB_REF_NAME}