From 396fb56eeba885fb01170286a027712f9c46eaaf Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:59:16 -0400 Subject: [PATCH] ci(release): fix destination directory of builds --- .github/workflows/build-repo.yml | 18 +++++++++++++----- README.md | 2 +- pkgbuilds/sunshine/.SRCINFO | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-repo.yml b/.github/workflows/build-repo.yml index e6e0b53..cb0bb6b 100644 --- a/.github/workflows/build-repo.yml +++ b/.github/workflows/build-repo.yml @@ -20,6 +20,7 @@ jobs: image: archlinux/archlinux:base-devel env: DISPLAY: ":1" + CONTAINER_DIR: pkgbuilds strategy: fail-fast: false matrix: @@ -60,12 +61,12 @@ jobs: uses: actions/checkout@v4 - name: Download and Patch beta PKGBUILDs - if: matrix.repo == 'lizardbyte-beta' + if: matrix.release_name == 'beta' run: | # we don't want any stable packages to be built, so remove them - rm -rf pkgbuilds - mkdir -p pkgbuilds - cd pkgbuilds + rm -rf ${CONTAINER_DIR} + mkdir -p ${CONTAINER_DIR} + cd ${CONTAINER_DIR} while IFS=' ' read -r repo og_pkg_name updated_pkg_name release_asset; do # Skip lines that start with # @@ -145,7 +146,7 @@ jobs: # generate build-pacman-repo.yaml build-pacman-repo print-config \ --repository repo/${{ matrix.repo }}.db.tar.gz \ - --container pkgbuilds \ + --container ${CONTAINER_DIR} \ --require-pkgbuild \ --require-srcinfo \ --with-record-failed-builds repo/failed-build-records.yaml \ @@ -163,6 +164,13 @@ jobs: build-pacman-repo build + # ensure files are present in the repo + repo_files=$(ls repo) + if [[ -z "${repo_files}" ]]; then + echo "::error:: No files found in repo" + exit 1 + fi + - name: Create/Update GitHub Release if: github.event_name == 'schedule' || github.event_name == 'push' uses: ncipollo/release-action@v1.14.0 diff --git a/README.md b/README.md index c59f0f2..312a9ce 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Server = https://github.com/LizardByte/pacman-repo/releases/latest/download ```conf [lizardbyte-beta] SigLevel = Optional -Server = https://github.com/LizardByte/pacman-repo/releases/beta/download +Server = https://github.com/LizardByte/pacman-repo/releases/download/beta ``` Then, run `sudo pacman -Sy` to update repository. diff --git a/pkgbuilds/sunshine/.SRCINFO b/pkgbuilds/sunshine/.SRCINFO index 0ffbbee..d7b7ac3 100644 --- a/pkgbuilds/sunshine/.SRCINFO +++ b/pkgbuilds/sunshine/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = sunshine pkgdesc = A self-hosted GameStream host for Moonlight. pkgver = 0.23.1 - pkgrel = 1 + pkgrel = 2 url = https://app.lizardbyte.dev/Sunshine install = sunshine.install arch = x86_64