=====================================================================

--- Bug Fixes ----------------------------

- AUR test-before-publish requires usage of the CIRCLE_TAG rather than
  the CIRCLE_BRANCH
This commit is contained in:
Wryn (yage) Wagner 2024-04-14 02:14:45 -06:00
parent f0a6b16a0c
commit 3ff44f8e58

View File

@ -44,7 +44,7 @@ commands:
custom: custom:
archlinux: archlinux:
prepare: prepare:
- &archlinux_prepare - &archlinux-prepare
run: run:
name: prepare archlinux dependencies name: prepare archlinux dependencies
command: | command: |
@ -53,18 +53,18 @@ custom:
echo "ci ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers echo "ci ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
clone-aur: clone-aur:
- &archlinux_clone_aur - &archlinux-clone-aur
archlinux-run: archlinux-run:
_name: clone aur/scwrypts _name: clone aur/scwrypts
command: git clone https://aur.archlinux.org/scwrypts.git aur command: git clone https://aur.archlinux.org/scwrypts.git aur
clone-scwrypts: clone-scwrypts:
- &archlinux_clone_scwrypts - &archlinux-clone-scwrypts
run: run:
name: clone wrynegade/scwrypts name: clone wrynegade/scwrypts
working_directory: /home/ci working_directory: /home/ci
command: | command: |
GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no" git clone -b "$CIRCLE_BRANCH" "$CIRCLE_REPOSITORY_URL" scwrypts GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no" git clone -b "$(echo $CIRCLE_BRANCH | grep . || echo $CIRCLE_TAG)" "$CIRCLE_REPOSITORY_URL" scwrypts
chown -R ci:ci ./scwrypts chown -R ci:ci ./scwrypts
@ -83,9 +83,9 @@ jobs:
aur-test: aur-test:
executor: archlinux executor: archlinux
steps: steps:
- *archlinux_prepare - *archlinux-prepare
- *archlinux_clone_aur - *archlinux-clone-aur
- *archlinux_clone_scwrypts - *archlinux-clone-scwrypts
- archlinux-run: - archlinux-run:
_name: test aur build on current source _name: test aur build on current source
working_directory: /home/ci/aur working_directory: /home/ci/aur
@ -108,8 +108,8 @@ jobs:
aur-publish: aur-publish:
executor: archlinux executor: archlinux
steps: steps:
- *archlinux_prepare - *archlinux-prepare
- *archlinux_clone_aur - *archlinux-clone-aur
- archlinux-run: - archlinux-run:
_name: update PKGBUILD and .SRCINFO _name: update PKGBUILD and .SRCINFO
working_directory: /home/ci/aur working_directory: /home/ci/aur
@ -239,13 +239,13 @@ workflows:
test: test:
jobs: jobs:
- aur-test: - aur-test:
&dev_filters &dev-filters
filters: filters:
branches: branches:
ignore: /^main$/ ignore: /^main$/
- python-test: *dev_filters - python-test: *dev-filters
- nodejs-test: *dev_filters - nodejs-test: *dev-filters
publish: publish:
jobs: jobs: