From e869e55252c7fafb4036a6cb3812a57bffd7053c Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Tue, 21 Mar 2023 14:48:28 -0700 Subject: [PATCH] Prep v3.2.1 Development Branch --- .github/workflows/commit.yml | 25 ++++++++++++++---------- .github/workflows/release.yml | 36 ++++++++++++++++++++--------------- Source/Doc/Basic.h | 4 ++-- Source/ver.inc | 4 ++-- Source/ver.lib | 4 ++-- 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index 3a2ac481..2fa79388 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -13,16 +13,18 @@ jobs: runs-on: ubuntu-latest steps: - - name: Make Slugs - uses: rlespinasse/github-slug-action@v4.4.1 - - name: Checkout uses: actions/checkout@v3.3.0 + - name: Get Commit Ref + run: | + COMMIT_REF=$(git rev-parse --short $GITHUB_SHA) + echo "COMMIT_REF: $COMMIT_REF" + echo "COMMIT_REF=$COMMIT_REF" >>$GITHUB_ENV + - name: Build run: | export TZ='America/Los_Angeles' - sudo apt-get install libncurses-dev sudo apt-get install srecord make dist rm -rf .git* @@ -36,19 +38,22 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3.1.1 with: - name: RomWBW-${{env.GITHUB_SHA_SHORT}}-Linux + name: RomWBW-${{env.COMMIT_REF}}-Linux path: . buildMacOS: runs-on: macOS-latest steps: - - name: Make Slugs - uses: rlespinasse/github-slug-action@v4.4.1 - - name: Checkout uses: actions/checkout@v3.3.0 + - name: Get Commit Ref + run: | + COMMIT_REF=$(git rev-parse --short $GITHUB_SHA) + echo "COMMIT_REF: $COMMIT_REF" + echo "COMMIT_REF=$COMMIT_REF" >>$GITHUB_ENV + - name: Build run: | export TZ='America/Los_Angeles' @@ -65,5 +70,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3.1.1 with: - name: RomWBW-${{env.GITHUB_SHA_SHORT}}-MacOS - path: . \ No newline at end of file + name: RomWBW-${{env.COMMIT_REF}}-MacOS + path: . diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1c842d01..0b0f5680 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,15 +14,6 @@ jobs: - name: Checkout uses: actions/checkout@v3.3.0 - - name: Create Package Label - run: | - echo GITHUB_REF: "$GITHUB_REF" - LABEL=`echo "$GITHUB_REF" | sed "s|^refs/tags/||"` - echo "PKGLBL=$LABEL" >> $GITHUB_ENV - echo PKGLBL: "$PKGLBL" - echo Upload URL: "${{github.event.release.upload_url}}" - echo GITHUB_TOKEN: "${{secrets.GITHUB_TOKEN}}" - - name: Build run: | export TZ='America/Los_Angeles' @@ -33,22 +24,37 @@ jobs: - name: Create Package Archive run: | - zip -r RomWBW-${{env.PKGLBL}}-Package.zip . + zip -r RomWBW-${{github.ref_name}}-Package.zip . + + - name: Set Title + run: | + echo "Tag: ${{github.ref_name}}" + if grep -q "dev" <<< "${{github.ref_name}}"; then + TITLE="RomWBW Development Snapshot" + elif grep -q "pre" <<< "${{github.ref_name}}"; then + TITLE="RomWBW Prerelease" + elif grep -q "rc" <<< "${{github.ref_name}}"; then + TITLE="RomWBW Release Candidate" + else + TITLE="RomWBW" + fi + echo "Title: $TITLE" + echo "TITLE=$TITLE" >>$GITHUB_ENV - name: Attach Package Archive uses: wwarthen/actions/packages/automatic-releases@built-packages with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" + repo_token: "${{secrets.GITHUB_TOKEN}}" draft: true prerelease: true - title: "RomWBW Development SnapShot ${{env.PKGLBL}}" + title: "${{env.TITLE}} ${{github.ref_name}}" files: | - RomWBW-${{env.PKGLBL}}-Package.zip + RomWBW-${{github.ref_name}}-Package.zip # - name: Upload Package Archive # uses: AButler/upload-release-assets@v2.0.2 # with: -# repo-token: ${{ secrets.GITHUB_TOKEN }} +# repo-token: ${{secrets.github_token}} # files: | # RomWBW-${{env.PKGLBL}}-Package.zip @@ -57,7 +63,7 @@ jobs: # uses: docker://antonyurchenko/git-release:latest # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# RELEASE_NAME_PREFIX: "Development SnapShot Release " +# RELEASE_NAME_PREFIX: "${{env.TITLE}} " # CHANGELOG_FILE: "none" # with: # args: | diff --git a/Source/Doc/Basic.h b/Source/Doc/Basic.h index 7e4e9bb0..f3b529b3 100644 --- a/Source/Doc/Basic.h +++ b/Source/Doc/Basic.h @@ -1,6 +1,6 @@ -$define{doc_ver}{Version 3.2}$ +$define{doc_ver}{Version 3.2.1}$ $define{doc_product}{RomWBW}$ -$define{doc_root}{https://github.com/wwarthen/RomWBW/raw/master/Doc}$ +$define{doc_root}{https://github.com/wwarthen/RomWBW/raw/dev/Doc}$ $ifndef{doc_title}$ $define{doc_title}{Document Title}$ $endif$ $ifndef{doc_author}$ $define{doc_author}{Wayne Warthen}$ $endif$ $define{doc_date}{$date{%d %b %Y}$}$ diff --git a/Source/ver.inc b/Source/ver.inc index d09a3632..eecaa97e 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -1,8 +1,8 @@ #DEFINE RMJ 3 #DEFINE RMN 2 -#DEFINE RUP 0 +#DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.2.0" +#DEFINE BIOSVER "3.2.1-dev.0" #define rmj RMJ #define rmn RMN #define rup RUP diff --git a/Source/ver.lib b/Source/ver.lib index 512020b6..b39a7dc5 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -1,7 +1,7 @@ rmj equ 3 rmn equ 2 -rup equ 0 +rup equ 1 rtp equ 0 biosver macro - db "3.2.0" + db "3.2.1-dev.0" endm