Skip to content

Commit

Permalink
v4.2.3
Browse files Browse the repository at this point in the history
=====================================================================

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

- AUR test-before-publish requires usage of the CIRCLE_TAG rather than
  the CIRCLE_BRANCH
  • Loading branch information
wrynegade committed Apr 14, 2024
1 parent f0a6b16 commit 3ff44f8
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ commands:
custom:
archlinux:
prepare:
- &archlinux_prepare
- &archlinux-prepare
run:
name: prepare archlinux dependencies
command: |
Expand All @@ -53,18 +53,18 @@ custom:
echo "ci ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
clone-aur:
- &archlinux_clone_aur
- &archlinux-clone-aur
archlinux-run:
_name: clone aur/scwrypts
command: git clone https://aur.archlinux.org/scwrypts.git aur

clone-scwrypts:
- &archlinux_clone_scwrypts
- &archlinux-clone-scwrypts
run:
name: clone wrynegade/scwrypts
working_directory: /home/ci
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
Expand All @@ -83,9 +83,9 @@ jobs:
aur-test:
executor: archlinux
steps:
- *archlinux_prepare
- *archlinux_clone_aur
- *archlinux_clone_scwrypts
- *archlinux-prepare
- *archlinux-clone-aur
- *archlinux-clone-scwrypts
- archlinux-run:
_name: test aur build on current source
working_directory: /home/ci/aur
Expand All @@ -108,8 +108,8 @@ jobs:
aur-publish:
executor: archlinux
steps:
- *archlinux_prepare
- *archlinux_clone_aur
- *archlinux-prepare
- *archlinux-clone-aur
- archlinux-run:
_name: update PKGBUILD and .SRCINFO
working_directory: /home/ci/aur
Expand Down Expand Up @@ -239,13 +239,13 @@ workflows:
test:
jobs:
- aur-test:
&dev_filters
&dev-filters
filters:
branches:
ignore: /^main$/

- python-test: *dev_filters
- nodejs-test: *dev_filters
- python-test: *dev-filters
- nodejs-test: *dev-filters

publish:
jobs:
Expand Down

0 comments on commit 3ff44f8

Please sign in to comment.