diff options
| -rw-r--r-- | .woodpecker.yml | 16 | ||||
| -rwxr-xr-x | scripts/ci-print-_service.sh | 32 | ||||
| -rw-r--r-- | scripts/prep-librewolf-dpkg.conf | 4 |
3 files changed, 42 insertions, 10 deletions
diff --git a/.woodpecker.yml b/.woodpecker.yml index aa8dc8d..d7c733d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,8 +2,7 @@ steps: build: image: debian commands: - - echo ./scripts/prep-librewolf-dpkg.sh - - echo disabled for testing + - ./scripts/prep-librewolf-dpkg.sh upload: image: woodpeckerci/plugin-s3 secrets: [aws_access_key_id, aws_secret_access_key] @@ -16,11 +15,8 @@ steps: display-links: image: alpine commands: - - . ./scripts/prep-librewolf-dpkg.conf - - env - - echo "https://storage.ci.librewolf.net/artifacts/${CI_PIPELINE_NUMBER}/librewolf_$${firefox_version}.orig.tar.xz" - - echo "https://storage.ci.librewolf.net/artifacts/${CI_PIPELINE_NUMBER}/librewolf-$${distro_firefox_version}.debian.tar.xz" - - echo "https://storage.ci.librewolf.net/artifacts/${CI_PIPELINE_NUMBER}/librewolf-$${distro_firefox_version}.dsc" - #- echo "https://storage.ci.librewolf.net/artifacts/${CI_BUILD_NUMBER}/librewolf_$(cat version).orig.tar.xz" - #- echo "https://storage.ci.librewolf.net/artifacts/${CI_BUILD_NUMBER}/librewolf-$(cat version)-$(cat release).debian.tar.xz" - #- echo "https://storage.ci.librewolf.net/artifacts/${CI_BUILD_NUMBER}/librewolf-$(cat version)-$(cat release).dsc" + - ./scripts/ci-print-_service.sh + #- . ./scripts/prep-librewolf-dpkg.conf + #- echo "https://storage.ci.librewolf.net/artifacts/${CI_PIPELINE_NUMBER}/librewolf_$${firefox_version}.orig.tar.xz" + #- echo "https://storage.ci.librewolf.net/artifacts/${CI_PIPELINE_NUMBER}/librewolf-$${distro_firefox_version}.debian.tar.xz" + #- echo "https://storage.ci.librewolf.net/artifacts/${CI_PIPELINE_NUMBER}/librewolf-$${distro_firefox_version}.dsc" diff --git a/scripts/ci-print-_service.sh b/scripts/ci-print-_service.sh new file mode 100755 index 0000000..fcc499c --- /dev/null +++ b/scripts/ci-print-_service.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Goal: print entirety of a useful OBS service file + +##################################### +# Load settings +# basically, dot-source the conf file. +test -z "${librewolf_dpkg_conf}" && export librewolf_dpkg_conf="$( find "$( dirname "${0}" )" -maxdepth 2 -name "prep-librewolf-dpkg.conf" -print 2>/dev/null | head -n1 )" +test ! -r "${librewolf_dpkg_conf}" && { echo "Unable to load config file, which should be named prep-librewolf-dpkg.conf. Aborted." 1>&2 ; exit 1 ; } +. "${librewolf_dpkg_conf}" + +cat <<EOF +<services> + <service name="download_url"> + <param name="protocol">${ARTIFACT_PROTOCOL}</param> + <param name="host">${ARTIFACT_HOSTNAME}</param> + <param name="path">${ARTIFACT_PATHDIR}/librewolf_${distro_firefox_version}.debian.tar.xz</param> + <param name="filename">librewolf_${distro_firefox_version}.debian.tar.xz</param> + </service> + <service name="download_url"> + <param name="protocol">${ARTIFACT_PROTOCOL}</param> + <param name="host">${ARTIFACT_HOSTNAME}</param> + <param name="path">${ARTIFACT_PATHDIR}/librewolf_${distro_firefox_version}.dsc</param> + <param name="filename">librewolf_${distro_firefox_version}.dsc</param> + </service> + <service name="download_url"> + <param name="protocol">${ARTIFACT_PROTOCOL}</param> + <param name="host">${ARTIFACT_HOSTNAME}</param> + <param name="path">${ARTIFACT_PATHDIR}/librewolf_${firefox_version}.orig.tar.xz</param> + <param name="filename">librewolf_${firefox_version}.orig.tar.xz</param> + </service> +</services> +EOF diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf index 915e3fc..3d64f3a 100644 --- a/scripts/prep-librewolf-dpkg.conf +++ b/scripts/prep-librewolf-dpkg.conf @@ -12,3 +12,7 @@ source_version=${source_version:-'117.0-1'} settings_commit=${settings_commit:-'master'} CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} output_dir=${CI_PROJECT_DIR}/out + +ARTIFACT_PROTOCOL=https +ARTIFACT_HOSTNAME=storage.ci.librewolf.net +ARTIFACT_PATHDIR="/artifacts/${CI_PIPELINE_NUMBER}" |