Skip to content

Commit 40352b0

Browse files
committed
fix(ci): correctly name release branch in releaserc, +eliminate some trailing spaces
1 parent b7ccb2e commit 40352b0

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

.github/actions/refetch-artifacts/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ runs:
88
path: ./dist
99
- uses: actions/download-artifact@v4
1010
with:
11-
name: sdist
11+
name: sdist
1212
path: ./dist

.github/workflows/lint-and-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
name: Lint and test
2-
on:
2+
on:
33
pull_request:
44
push:
55
branches:
66
- master
77
- 'ci/**' # ci testing, pre-releases
8-
#- 'feature/**'
8+
#- 'feature/**'
99

1010
jobs:
11-
lint:
11+
lint:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
1515
- uses: ./.github/actions/setup
1616
- name: Lint
1717
id: lint
18-
run: tox -e lint
18+
run: tox -e lint
1919
continue-on-error: true
2020
- name: Emit warning if lint failed
2121
if: ${{ steps.lint.outcome != 'success' }}
@@ -25,7 +25,7 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
os: [ ubuntu-latest ]
28-
python:
28+
python:
2929
- "3.12"
3030
- "3.11"
3131
- "3.10"

.github/workflows/release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ on:
1515
description: "Run in dry-run mode (no publish)"
1616
required: false
1717
default: "true"
18-
push: # only temporary, until this file lands on master (see above)
18+
push: # only temporary, until this file lands on master (see above)
1919
branches:
2020
- 'ci/**'
2121

22-
# MUSTHAVE: Trusted publisher access for both repos.
22+
# MUSTHAVE: Trusted publisher access for both repos.
2323
# NOTE: according to docs, 'test' repo accounts are ephemeral and can be wiped at any time
2424
env:
2525
DRY_RUN: ${{ github.event.inputs.dry_run || 'false' }}
@@ -45,10 +45,11 @@ jobs:
4545
GIT_AUTHOR_EMAIL: [email protected]
4646
GIT_COMMITTER_NAME: appland-release
4747
GIT_COMMITTER_EMAIL: [email protected]
48+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4849
run: |
49-
if [ "$DRY_RUN" = "true" ]; then
50+
if [ "$DRY_RUN" = "true" ]; then
5051
semantic-release --dry-run
51-
else
52+
else
5253
semantic-release
5354
fi
5455
- name: Upload wheel
@@ -65,7 +66,7 @@ jobs:
6566
path: dist/*.tar.gz
6667
outputs: # not reused in fact
6768
release_tag: ${{ steps.semantic-release.outputs.next_release_tag }}
68-
69+
6970
smoketest:
7071
runs-on: ubuntu-latest
7172
needs: release
@@ -97,4 +98,4 @@ jobs:
9798
- name: Publish package distributions to PyPI
9899
uses: pypa/gh-action-pypi-publish@release/v1
99100
with:
100-
repository-url: ${{ github.ref_name == 'master' && env.pypi_main_repo || env.pypi_test_repo }}
101+
repository-url: ${{ github.ref_name == 'master' && env.pypi_main_repo || env.pypi_test_repo }}

.releaserc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
branches:
2-
- main
2+
- master
33
- name: ci/*
44
prerelease: ci
55
#- name: develop

0 commit comments

Comments
 (0)