diff --git a/.github/workflows/build-repo.yml b/.github/workflows/build-repo.yml index e6e0b53..1726cd5 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: @@ -58,14 +59,24 @@ jobs: - name: Checkout uses: actions/checkout@v4 + with: + path: temp + + - name: Configure directories + if: matrix.release_name == 'stable' + run: | + # create the destination directory for built packages + mkdir -p ${CONTAINER_DIR} + + # move all files and directories from the PKGBUILDs to the container directory + mv temp/${CONTAINER_DIR}/* ${CONTAINER_DIR} - 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 + 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 # @@ -125,7 +136,7 @@ jobs: ls -a popd - done < ../beta-repos.conf + done < ../temp/beta-repos.conf - name: Init run: | @@ -145,9 +156,8 @@ 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 \ --with-install-missing-dependencies true \ --with-clean-before-build false \ @@ -163,6 +173,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 @@ -170,7 +187,7 @@ jobs: allowUpdates: true artifactErrorsFailBuild: true artifacts: repo/* - bodyFile: README.md + bodyFile: temp/README.md commit: master makeLatest: ${{ matrix.release_name == 'stable' || false }} name: ${{ matrix.release_name }} 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.