oneil1987/TX-Ultimate-Easy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from edwardtfn/new-versioning-03

Browse Source 
Rollback to the last working point
This commit is contained in:
Edward Firmo
2024-12-21 17:50:34 +01:00
committed by GitHub
parent d04c2aff2f 8558bc3650
commit 46c04eb992
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.github/workflows/versioning.yml vendored
View File

@@ -1,4 +1,4 @@
# Workflow for managing versioning, tagging, and temporary branches # Workflow for managing versioning and tagging
--- ---
name: Version Bump and Tag name: Version Bump and Tag
@@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: "actions/checkout@v4"
- name: Set up Git - name: Set up Git
run: | run: |
@@ -36,27 +36,13 @@ jobs:
- name: Bump Version - name: Bump Version
run: | run: |
chmod +x ./versioning/bump_version.sh chmod +x "./versioning/bump_version.sh"
./versioning/bump_version.sh "./versioning/bump_version.sh"
- name: Push Changes to Temporary Branch - name: Push Changes to Temporary Branch
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
run: | run: |
git push "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git" HEAD git push "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" main
- name: Merge Changes into Main git push "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" --tags
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git checkout main
git pull "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git" main
git merge --no-ff "$TEMP_BRANCH" -m "Automated Version Bump [skip-versioning]"
git push "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git" main
- name: Delete Temporary Branch
if: always()
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git push "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git" --delete "$TEMP_BRANCH"
... ...

15
versioning/bump_version.sh
View File

@@ -12,8 +12,8 @@ fi
# Extract components # Extract components
CURRENT_YEAR=$(date +%Y) CURRENT_YEAR=$(date +%Y)
CURRENT_MONTH=$(date +%-m) # Use %-m to avoid leading zero for the month CURRENT_MONTH=$(date +%m)
if ! [[ "$CURRENT_VERSION" =~ ^[0-9]{4}\.[0-9]+\.[0-9]+$ ]]; then if ! [[ "$CURRENT_VERSION" =~ ^[0-9]{4}\.[0-9]{2}\.[0-9]{2}$ ]]; then
echo "Error: Invalid version format in $VERSION_FILE" echo "Error: Invalid version format in $VERSION_FILE"
exit 1 exit 1
fi fi
@@ -24,12 +24,17 @@ VERSION_MONTH=$(echo "$CURRENT_VERSION" | awk -F. '{print $2}')
# Determine new version # Determine new version
if [[ "$CURRENT_YEAR" == "$VERSION_YEAR" && "$CURRENT_MONTH" == "$VERSION_MONTH" ]]; then if [[ "$CURRENT_YEAR" == "$VERSION_YEAR" && "$CURRENT_MONTH" == "$VERSION_MONTH" ]]; then
NEXT_SEQ=$((CURRENT_SEQ + 1)) NEXT_SEQ=$((10#$CURRENT_SEQ + 1))
if [ $NEXT_SEQ -gt 99 ]; then
echo "Error: Sequence number would exceed 99"
exit 1
fi
NEW_SEQ=$(printf "%02d" $NEXT_SEQ)
else else
NEXT_SEQ=1 # Reset sequence for a new month NEW_SEQ="01" # Reset sequence for a new month
fi fi
NEW_VERSION="${CURRENT_YEAR}.${CURRENT_MONTH}.${NEXT_SEQ}" NEW_VERSION="${CURRENT_YEAR}.${CURRENT_MONTH}.${NEW_SEQ}"
# Update the plain text VERSION file # Update the plain text VERSION file
echo "$NEW_VERSION" > "$VERSION_FILE" echo "$NEW_VERSION" > "$VERSION_FILE"