Compare commits

..

No commits in common. "master" and "v2.27" have entirely different histories.

12 changed files with 27 additions and 26 deletions

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/macos",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/macos",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/macos",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/macos",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "../codespaces.yml", "dockerComposeFile": "../codespaces.yml",
"workspaceFolder": "/workspaces/macos",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -15,5 +15,6 @@
"onAutoForward": "ignore" "onAutoForward": "ignore"
}, },
"dockerComposeFile": "codespaces.yml", "dockerComposeFile": "codespaces.yml",
"workspaceFolder": "/workspaces/macos",
"initializeCommand": "docker system prune --all --force" "initializeCommand": "docker system prune --all --force"
} }

View file

@ -22,7 +22,7 @@ jobs:
steps: steps:
- -
name: Checkout name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
with: with:
fetch-depth: 0 fetch-depth: 0
- -

View file

@ -7,7 +7,7 @@ jobs:
name: shellcheck name: shellcheck
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v5
- name: Run ShellCheck - name: Run ShellCheck
uses: ludeeus/action-shellcheck@master uses: ludeeus/action-shellcheck@master
env: env:

View file

@ -12,15 +12,13 @@ jobs:
dockerHubDescription: dockerHubDescription:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- - uses: actions/checkout@v5
name: Checkout repo -
uses: actions/checkout@v6 name: Docker Hub Description
- uses: peter-evans/dockerhub-description@v5
name: Docker Hub Description with:
uses: peter-evans/dockerhub-description@v5 username: ${{ secrets.DOCKERHUB_USERNAME }}
with: password: ${{ secrets.DOCKERHUB_TOKEN }}
username: ${{ secrets.DOCKERHUB_USERNAME }} repository: ${{ secrets.DOCKERHUB_REPO }}
password: ${{ secrets.DOCKERHUB_TOKEN }} short-description: ${{ github.event.repository.description }}
repository: ${{ secrets.DOCKERHUB_REPO }} readme-filepath: ./readme.md
short-description: ${{ github.event.repository.description }}
readme-filepath: ./readme.md

View file

@ -15,7 +15,7 @@ jobs:
steps: steps:
- -
name: Checkout name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@v5
- -
name: Spelling name: Spelling
uses: reviewdog/action-misspell@v1 uses: reviewdog/action-misspell@v1
@ -26,7 +26,7 @@ jobs:
*.md *.md
*.sh *.sh
reporter: github-pr-review reporter: github-pr-review
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
- -
name: Hadolint name: Hadolint
uses: reviewdog/action-hadolint@v1 uses: reviewdog/action-hadolint@v1
@ -34,28 +34,28 @@ jobs:
level: warning level: warning
reporter: github-pr-review reporter: github-pr-review
hadolint_ignore: DL3008 DL3018 DL3020 DL3029 DL3059 hadolint_ignore: DL3008 DL3018 DL3020 DL3029 DL3059
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
- -
name: YamlLint name: YamlLint
uses: reviewdog/action-yamllint@v1 uses: reviewdog/action-yamllint@v1
with: with:
level: warning level: warning
reporter: github-pr-review reporter: github-pr-review
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
- -
name: ActionLint name: ActionLint
uses: reviewdog/action-actionlint@v1 uses: reviewdog/action-actionlint@v1
with: with:
level: warning level: warning
reporter: github-pr-review reporter: github-pr-review
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
- -
name: Shellformat name: Shellformat
uses: reviewdog/action-shfmt@v1 uses: reviewdog/action-shfmt@v1
with: with:
level: warning level: warning
shfmt_flags: "-i 2 -ci -bn" shfmt_flags: "-i 2 -ci -bn"
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
- -
name: Shellcheck name: Shellcheck
uses: reviewdog/action-shellcheck@v1 uses: reviewdog/action-shellcheck@v1
@ -63,4 +63,4 @@ jobs:
level: warning level: warning
reporter: github-pr-review reporter: github-pr-review
shellcheck_flags: -x -e SC1091 -e SC2001 -e SC2002 -e SC2034 -e SC2064 -e SC2153 -e SC2317 -e SC2028 shellcheck_flags: -x -e SC1091 -e SC2001 -e SC2002 -e SC2034 -e SC2064 -e SC2153 -e SC2317 -e SC2028
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.REPO_ACCESS_TOKEN }}

View file

@ -12,7 +12,7 @@ RUN apk --update --no-cache add unzip && \
rm -rf /tmp/* /var/tmp/* /var/cache/apk/* rm -rf /tmp/* /var/tmp/* /var/cache/apk/*
FROM scratch AS runner FROM scratch AS runner
COPY --from=qemux/qemu:7.29 / / COPY --from=qemux/qemu:7.27 / /
ARG VERSION_ARG="0.0" ARG VERSION_ARG="0.0"
ARG VERSION_KVM_OPENCORE="v21" ARG VERSION_KVM_OPENCORE="v21"

View file

@ -48,10 +48,7 @@ if [ ! -s "$DEST.rom" ] || [ ! -f "$DEST.rom" ]; then
if [[ "${LOGO:-}" == [Nn]* ]]; then if [[ "${LOGO:-}" == [Nn]* ]]; then
cp "$OVMF/$ROM" "$DEST.tmp" cp "$OVMF/$ROM" "$DEST.tmp"
else else
if ! /run/utk.bin "$OVMF/$ROM" replace_ffs LogoDXE "/var/www/img/${PROCESS,,}.ffs" save "$DEST.tmp"; then /run/utk.bin "$OVMF/$ROM" replace_ffs LogoDXE "/var/www/img/${PROCESS,,}.ffs" save "$DEST.tmp"
warn "failed to add custom logo to BIOS!"
cp "$OVMF/$ROM" "$DEST.tmp"
fi
fi fi
mv "$DEST.tmp" "$DEST.rom" mv "$DEST.tmp" "$DEST.rom"
! setOwner "$DEST.rom" && error "Failed to set the owner for \"$DEST.rom\" !" ! setOwner "$DEST.rom" && error "Failed to set the owner for \"$DEST.rom\" !"