Skip to content

Commit c7d2943

Browse files
committed
push
1 parent 8ad3969 commit c7d2943

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.github/workflows/build-on-change.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ jobs:
104104
uses: ./.github/workflows/matrix_builds.yaml
105105
with:
106106
sbuild-url: "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/${{ matrix.recipe.path }}"
107-
# Uses the repo owner's GHCR namespace for proper permissions
108107
ghcr-url: ${{ contains(matrix.recipe.path, 'packages/') && format('ghcr.io/{0}/pkgcache', github.repository_owner) || format('ghcr.io/{0}/bincache', github.repository_owner) }}
109108
pkg-family: ${{ github.event.repository.name }}
110109
rebuild: true

.github/workflows/manual-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
host: ${{ inputs.host }}
3636
sbuild-url: "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/${{ inputs.recipe }}"
37-
ghcr-url: ${{ inputs.cache_type == 'auto' && (contains(inputs.recipe, 'packages/') && 'ghcr.io/pkgforge/pkgcache' || 'ghcr.io/pkgforge/bincache') || (inputs.cache_type == 'pkgcache' && 'ghcr.io/pkgforge/pkgcache' || 'ghcr.io/pkgforge/bincache') }}
37+
ghcr-url: ${{ contains(inputs.recipe, 'packages/') && format('ghcr.io/{0}/pkgcache', github.repository_owner) || format('ghcr.io/{0}/bincache', github.repository_owner) }}
3838
pkg-family: ${{ github.event.repository.name }}
3939
rebuild: true
4040
logs: true

.github/workflows/matrix_builds.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,14 @@ jobs:
232232
sudo apt-fast install apt-transport-https apt-utils bc ca-certificates coreutils curl dos2unix fdupes git-lfs gnupg2 \
233233
jq moreutils p7zip-full rename rsync software-properties-common texinfo tmux torsocks util-linux wget zsync -y -qq 2>/dev/null
234234
sudo apt-fast update -y -qq 2>/dev/null
235+
#Install oras for GHCR push
236+
ORAS_VERSION="1.2.0"
237+
case "$(uname -m)" in
238+
x86_64) ORAS_ARCH="amd64" ;;
239+
aarch64) ORAS_ARCH="arm64" ;;
240+
esac
241+
curl -fsSL "https://github.com/oras-project/oras/releases/download/v${ORAS_VERSION}/oras_${ORAS_VERSION}_linux_${ORAS_ARCH}.tar.gz" | sudo tar -xzf - -C /usr/local/bin oras
242+
oras version
235243
#Minisign
236244
if [ -n "${MINISIGN_KEY+x}" ] && [[ "${MINISIGN_KEY}" =~ ^[^[:space:]]+$ ]]; then
237245
mkdir -pv "${HOME}/.minisign"

0 commit comments

Comments
 (0)