Skip to content
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

Do not fail version check if development version is set #197

Merged
merged 6 commits into from
Nov 16, 2023
Merged

Do not fail version check if development version is set #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31eb105
Do not fail version check if development version is set
cicdguy Nov 15, 2023
80a7d4c
Greater than or equal to
cicdguy Nov 15, 2023
9249bc3
Handle bash-related nuances
cicdguy Nov 15, 2023
d6ca1df
Trim any newlines
cicdguy Nov 16, 2023
98acc32
Trim any newlines
cicdguy Nov 16, 2023
2f71b14
Just use test
cicdguy Nov 16, 2023
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
13 changes: 3 additions & 10 deletions .github/workflows/version-bump.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ jobs:
if [ -f NEWS.md ]
then {
git config --global --add safe.directory $(pwd)
DESC_VERSION=$(R --slave -e 'cat(paste(desc::desc_get_version()))')
NEWS_VERSION=$(awk '/^#+ /{print $3,$4; exit}' NEWS.md)
DESC_VERSION=$(R --slave -e 'cat(paste(desc::desc_get_version()))' | tr -d '\n')
NEWS_VERSION=$(awk '/^#+ /{print $3,$4; exit}' NEWS.md | tr -d '\n')
FIRST_NEWS_LINE=$(head -1 NEWS.md)
if [ "${{ inputs.vbump-after-release }}" == "true" ]; then
# Add a new section with the released version that will be vbumped below.
Expand All @@ -87,18 +87,11 @@ jobs:
fi
# Replace only the first occurence of $NEWS_VERSION,
# but only if it's not already set to (development version)
if [ "$NEWS_VERSION" != "(development version)" ]
if [ "${NEWS_VERSION}" != "(development version)" ]
then {
sed -i "0,/$NEWS_VERSION/s/$NEWS_VERSION/$DESC_VERSION/" NEWS.md
}
fi
NEWS_VERSION=$(awk '/^#+ /{print $3,$4; exit}' NEWS.md)
echo "Updated NEWS.md version: $NEWS_VERSION"
if (test $DESC_VERSION != $NEWS_VERSION ); then
echo "🙈 Updated NEWS.md and DESCRIPTION have different versions!"
echo "Please ensure that the versions in the NEWS.md and DESCRIPTION are the same 🙏"
exit 1
fi
echo "NEW_PKG_VERSION=${DESC_VERSION}" >> $GITHUB_ENV
}
fi
Expand Down
26 changes: 18 additions & 8 deletions .github/workflows/version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,27 @@ jobs:

- name: NEWS.md and DESCRIPTION Version check 🏁
run: |
DESC_VERSION=$(awk -F: '/Version:/{gsub(/[ ]+/,"") ; print $2}' DESCRIPTION)
NEWS_VERSION=$(awk '/^#+ /{print $3; exit}' NEWS.md)
DESC_VERSION=$(awk -F: '/Version:/{gsub(/[ ]+/,"") ; print $2}' DESCRIPTION | tr -d '\n')
NEWS_VERSION=$(awk '/^#+ /{print $3,$4; exit}' NEWS.md | tr -d '\n')
DESC_DEV_VERSION=$(echo $DESC_VERSION | awk -F '.' '{print $NF}')
echo "NEWS.md version: $NEWS_VERSION"
echo "DESCRIPTION version: $DESC_VERSION"
if (test $DESC_VERSION = $NEWS_VERSION ); then
echo "NEWS.md and DESCRIPTION have the same version"
else
echo "🙈 NEWS.md and DESCRIPTION have different versions!"
echo "🙏 Please fix this."
exit 1
if test $DESC_VERSION = $NEWS_VERSION
then {
echo "NEWS.md and DESCRIPTION have the same version 🎉"
exit 0
}
fi
if [[ $DESC_DEV_VERSION -ge 9000 && "${NEWS_VERSION}" == "(development version)" ]]
then {
echo "NEWS.md and DESCRIPTION file versions are okay as package is in development mode."
echo "All is okay 🆗"
exit 0
}
fi
echo "🙈 NEWS.md and DESCRIPTION have different versions!"
echo "🙏 Please fix this."
exit 1
shell: bash
working-directory: ${{ inputs.package-subdirectory }}

Expand Down
Loading