Skip to content

Commit a30098b

Browse files
committed
Use 'releases/xxx' branches and add action filter for web build
1 parent 8fa8762 commit a30098b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/build-website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: build-website
22

33
on:
44
push:
5-
branches: [ main, web_site ]
5+
branches: [ main, web_site, 'releases/**' ]
66

77
jobs:
88
publish:

release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fi
5959
# There are mutable operations from here on
6060

6161
echo "Creating release branch"
62-
git checkout -b "release_$TARGET_VERSION"
62+
git checkout -b "releases/$TARGET_VERSION"
6363

6464
# Update the two version files and push them
6565
echo "Updating version and tagging..."
@@ -73,7 +73,7 @@ VERSION = '$TARGET_VERSION'
7373
EOF
7474

7575
git commit -m "Updated version files to $TARGET_VERSION." RELEASE src/psij/version.py
76-
git push --set-upstream origin release_$TARGET_VERSION
76+
git push --set-upstream origin releases/$TARGET_VERSION
7777

7878
git tag -a "$TARGET_VERSION" -m "Tagging $TARGET_VERSION"
7979
git push origin --tags
@@ -83,7 +83,7 @@ python3 setup.py sdist
8383
python3 setup.py bdist_wheel
8484

8585
echo "Releasing PyPi package..."
86-
twine upload dist/*
86+
#twine upload dist/*
8787

8888
echo "Triggering web docs build..."
8989
git commit --allow-empty -m "Trigger web build for $TARGET_VERSION"

0 commit comments

Comments
 (0)