Skip to content

Further corrections to cutting a release #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmurphy18 merged 1 commit into from
Dec 4, 2024
Merged

Further corrections to cutting a release #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ jobs:
- name: Get linux/svtminion.sh on main branch sha256sum
run: |
echo "SH=$(sha256sum linux/svtminion.sh | awk '{ print $1 }')" >> "$GITHUB_ENV"
echo "VMTS_VERSION=$(sh linux/svtminion.sh --version | awk '{ print $4 }')" >> "$GITHUB_ENV"
echo "VMTS_VERSION=$(bash linux/svtminion.sh --version | awk '{ print $1 }')" >> "$GITHUB_ENV"
echo "DGM SH ,${SH}, and VMTS_VERSION ,${VMTS_VERSION},"

- uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/scripts/cut-release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ def main():
)
svtminion_script_path.write_text(
re.sub(
r'SCRIPT_VERSION="(.*)"',
f'SCRIPT_VERSION="{options.release_tag.lstrip("v")}"',
r'readonly SCRIPT_VERSION="(.*)"',
f'readonly SCRIPT_VERSION="{options.release_tag.lstrip("v")}"',
svtminion_script_path.read_text(),
)
)
Expand All @@ -212,8 +212,8 @@ def main():
)
svtminion_script_path.write_text(
re.sub(
r'\$SCRIPT_VERSION= "(.*)"',
f'$SCRIPT_VERSION= "{options.release_tag.lstrip("v")}"',
r'\$SCRIPT_VERSION = "(.*)"',
f'$SCRIPT_VERSION = "{options.release_tag.lstrip("v")}"',
svtminion_script_path.read_text(),
)
)
Expand Down
2 changes: 1 addition & 1 deletion linux/svtminion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -o pipefail
# using bash for now
# run this script as root, as needed to run Salt

readonly SCRIPT_VERSION='SCRIPT_VERSION_REPLACE'
readonly SCRIPT_VERSION="SCRIPT_VERSION_REPLACE"

# definitions

Expand Down
Loading