Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dd/copy-some-progs-…
Browse files Browse the repository at this point in the history
…rs-release
  • Loading branch information
DennisInSky committed Nov 27, 2024
2 parents 382ca82 + 567cfd3 commit 81e5be7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/rs-release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This workflow is triggered by a tag that matches the pattern rs/v*-rc.
# This workflow is triggered by a tag that matches the pattern rs/v*-pin.
# Essentially it does the following:
# - gathers release info including its version using created tag
# - applies version to the workspace and updates crates dependencies
Expand All @@ -13,7 +13,7 @@ name: '[rs] Release'
on:
push:
tags:
- 'rs/v*-rc'
- 'rs/v*-pin'

env:
# see https://api.github.com/users/github-actions%5Bbot%5D
Expand Down Expand Up @@ -53,15 +53,15 @@ jobs:
- name: Extract Release Info
id: release_info
run: |
RC_TAG=${GITHUB_REF#refs/tags/}
VERSION=${RC_TAG#rs/v}
VERSION="${VERSION%-rc}"
if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
PIN_TAG=${GITHUB_REF#refs/tags/}
VERSION=${PIN_TAG#rs/v}
VERSION="${VERSION%-pin}"
if [[ ! $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-z]+\.[0-9]+)?$ ]]; then
echo "'$VERSION' is not a valid semver version"
exit 1
fi
echo "RC Tag: $RC_TAG"
echo "rc_tag=$RC_TAG" >> $GITHUB_OUTPUT
echo "Pin Tag: $PIN_TAG"
echo "pin_tag=$PIN_TAG" >> $GITHUB_OUTPUT
echo "Version: $VERSION"
echo "version=$VERSION" >> $GITHUB_OUTPUT
Expand All @@ -84,7 +84,7 @@ jobs:
git add Cargo.lock
git commit -m "build(rs): update version to v${{ steps.release_info.outputs.version }}"
git push origin "$RC_BRANCH"
git push origin --delete "${{ steps.release_info.outputs.rc_tag }}"
git push origin --delete "${{ steps.release_info.outputs.pin_tag }}"
echo "branch=$RC_BRANCH" >> $GITHUB_OUTPUT
ws_tests:
Expand Down
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace.package]
version = "0.6.3"
version = "0.7.0"
authors = ["Gear Technologies"]
edition = "2021"
license = "GPL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion templates/set-vars.rhai
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ variable::set("mocks-feature-name", "mocks");

// Set versions of used crates
variable::set("mockall-version", "0.12");
variable::set("sails-rs-version", "0.6.3"); // NB: This version is updated autmatically by GH release workflow
variable::set("sails-rs-version", "0.7.0"); // NB: This version is updated autmatically by GH release workflow
variable::set("tokio-version", "1.41");

fn is_kebab_case(name) {
Expand Down

0 comments on commit 81e5be7

Please sign in to comment.