Skip to content

Commit

Permalink
Hopefully fix throwing files in the tip.
Browse files Browse the repository at this point in the history
Hook up more with env vars rather than hard-coded bintray.
  • Loading branch information
jeremyd2019 committed Jul 31, 2020
1 parent 9b78f35 commit 9e1d543
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
env:
PACMAN_REPOSITORY_NAME: build32
DEPLOY_PROVIDER: tip
#PACMAN_REPOSITORY_URL: blah
PACMAN_REPOSITORY_URL: https://github.com/${{ github.repository }}/releases/download/repo

jobs:
build32:
Expand Down Expand Up @@ -64,4 +64,4 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag: 'repo'
files: artifact/*
files: packages/*
2 changes: 1 addition & 1 deletion build32.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ done

# Deploy
cd ../artifacts
false && execute 'Generating pacman repository' create_pacman_repository "${PACMAN_REPOSITORY_NAME:-ci-build}" || execute 'Generating pacman repository' repo-add "${PACMAN_REPOSITORY_NAME:-ci-build}.db.tar.xz" *.pkg.tar.*
execute 'Generating pacman repository' create_pacman_repository "${PACMAN_REPOSITORY_NAME:-ci-build}"
execute 'SHA-256 checksums' sha256sum *
success 'All artifacts built successfully'
7 changes: 2 additions & 5 deletions ci-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ _build_add() {
# Download previous artifact
_download_previous() {
local filenames=("${@}")
[[ "${DEPLOY_PROVIDER}" = bintray ]] || return 1
for filename in "${filenames[@]}"; do
if ! wget --no-verbose "https://dl.bintray.com/${BINTRAY_ACCOUNT}/${BINTRAY_REPOSITORY}/${filename}"; then
if ! wget --no-verbose "${PACMAN_REPOSITORY_URL}/${filename}"; then
rm -f "${filenames[@]}"
return 1
fi
Expand Down Expand Up @@ -131,10 +130,8 @@ execute(){

# Update system
update_system() {
repman add ci.msys 'https://dl.bintray.com/alexpux/msys2' || return 1
repman add $PACMAN_REPOSITORY_NAME $PACMAN_REPOSITORY_URL || return 1
pacman --noconfirm --noprogressbar --sync --refresh --refresh --sysupgrade --sysupgrade || return 1
test -n "${DISABLE_QUALITY_CHECK}" && return 0 # TODO: remove this option when not anymore needed
pacman --noconfirm --needed --noprogressbar --sync ci.msys/pactoys
}

# Sort packages by dependency
Expand Down

0 comments on commit 9e1d543

Please sign in to comment.