Merge pull request #2485 from HDR-Development/pre-release

Migration Time
HDR-Development · Aug 1, 2024 · 3f6ec93 · 3f6ec93
2 parents 91f69f6 + 32a7dd4
commit 3f6ec93
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 110 deletions.
diff --git a/.github/workflows/build_beta.yml b/.github/workflows/build_beta.yml
@@ -267,66 +267,66 @@ jobs:
         overwrite: true
         body: ${{ needs.version_and_changelog.outputs.changelog }}
 
-  ################  handle the creation of to-nightly.zip  ################
-  to_nightly:
+  ################  handle the creation of to-prerelease.zip  ################
+  to_prerelease:
     runs-on: ubuntu-20.04
     needs: [full_package, version_and_changelog]
     steps:
     - name: checkout version
       uses: actions/[email protected]
 
-    # download the nightly
-    - id: latest_nightly
+    # download the prerelease
+    - id: latest_prerelease
       uses: robinraju/[email protected]
       with:
-        repository: "HDR-Development/HDR-Nightlies"
+        repository: "HDR-Development/HDR-PreReleases"
         latest: true
         fileName: "switch-package.zip"
 
-    # move the nightly to the artifacts dir
+    # move the prerelease to the artifacts dir
     - run: mkdir artifacts && mv switch-package.zip artifacts
 
-    # build the to-nightly.zip
-    - name: make to-nightly.zip artifact
+    # build the to-prerelease.zip
+    - name: make to-prerelease.zip artifact
       run: |
         python3 scripts/make_diff.py beta
 
     - name: show upgrade artifacts
       run: |
         ls && stat * && echo && ls upgrade_artifacts && stat upgrade_artifacts/*
 
-    - run: mv upgrade_artifacts/upgrade.zip to-nightly.zip
+    - run: mv upgrade_artifacts/upgrade.zip to-prerelease.zip
 
-    - run: mv upgrade_artifacts/deletions.json to_nightly_deletions.json
+    - run: mv upgrade_artifacts/deletions.json to_prerelease_deletions.json
 
     # get the most recent latest beta
     - id: latest_beta
       uses: pozetroninc/github-action-get-latest-release@master
       with:
         repository: HDR-Development/HDR-Releases
 
-    # upload the to-nightly.zip to the beta for the launcher
-    - name: Upload to-nightly.zip to beta
+    # upload the to-prerelease.zip to the beta for the launcher
+    - name: Upload to-prerelease.zip to beta
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.RELEASE_TOKEN }}
-        file: to-nightly.zip
+        file: to-prerelease.zip
         prerelease: false
         file_glob: false
-        asset_name: to-nightly.zip
+        asset_name: to-prerelease.zip
         repo_name: HDR-Development/HDR-Releases
         tag: ${{ steps.latest_beta.outputs.release }}
         overwrite: true
 
-    # upload the to_nightly_deletions.json to the beta for the launcher
-    - name: Upload to_nightly_deletions.json to beta
+    # upload the to_prerelease_deletions.json to the beta for the launcher
+    - name: Upload to_prerelease_deletions.json to beta
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.RELEASE_TOKEN }}
-        file: to_nightly_deletions.json
+        file: to_prerelease_deletions.json
         prerelease: false
         file_glob: false
-        asset_name: to_nightly_deletions.json
+        asset_name: to_prerelease_deletions.json
         repo_name: HDR-Development/HDR-Releases
         tag: ${{ steps.latest_beta.outputs.release }}
         overwrite: true
diff --git a/.github/workflows/build_nightly.yml → .github/workflows/build_prerelease.yml b/.github/workflows/build_nightly.yml → .github/workflows/build_prerelease.yml
@@ -1,4 +1,4 @@
-name: build_nightly
+name: build_prerelease
 on:
   push:
     branches:
@@ -100,7 +100,7 @@ jobs:
 
     # build the project
     - run: |
-        cd scripts && NO_RUST_NIGHTLY=1 python3 make_dist.py build version=${{ needs.version_and_changelog.outputs.version }}-nightly name=hdr && cd ..
+        cd scripts && NO_RUST_NIGHTLY=1 python3 make_dist.py build version=${{ needs.version_and_changelog.outputs.version }}-prerelease name=hdr && cd ..
       env:
         HOME: /root
 
@@ -139,12 +139,12 @@ jobs:
         prerelease: true
         file_glob: true
         asset_name: the_asset
-        release_name: ${{ needs.version_and_changelog.outputs.version }}-nightly
+        release_name: ${{ needs.version_and_changelog.outputs.version }}-prerelease
         tag: ${{ needs.version_and_changelog.outputs.version }}
         overwrite: true
         body: ${{ needs.version_and_changelog.outputs.changelog }}
 
-  # wait for any previous nightlies to complete, since we dont want to step on any 
+  # wait for any previous prereleases to complete, since we dont want to step on any 
   # full package uploads prior to this one.
   wait_for_previous_builds:
     runs-on: ubuntu-20.04
@@ -180,12 +180,12 @@ jobs:
     - id: package_latest
       uses: pozetroninc/github-action-get-latest-release@master
       with:
-        repository: HDR-Development/HDR-Nightlies
+        repository: HDR-Development/HDR-PreReleases
 
     # build the upgrade.zip and deletions.json
     - name: make upgrade artifacts
       run: |
-        python3 scripts/make_diff.py nightly
+        python3 scripts/make_diff.py prerelease
 
     - name: show upgrade artifacts
       run: |
@@ -200,7 +200,7 @@ jobs:
         prerelease: false
         file_glob: true
         asset_name: upgrade
-        repo_name: HDR-Development/HDR-Nightlies
+        repo_name: HDR-Development/HDR-PreReleases
         tag: ${{ steps.package_latest.outputs.release }}
         overwrite: true
 
@@ -213,7 +213,7 @@ jobs:
         prerelease: false
         file_glob: true
         asset_name: deletions
-        repo_name: HDR-Development/HDR-Nightlies
+        repo_name: HDR-Development/HDR-PreReleases
         tag: ${{ steps.package_latest.outputs.release }}
         overwrite: true
 
@@ -256,86 +256,86 @@ jobs:
     #     API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB_HDRSTAGETOOL }}
     #   with:
     #     source_file: 'artifacts/lvd.zip'
-    #     destination_folder: 'nightly'
+    #     destination_folder: 'prerelease'
     #     destination_repo: 'SuddyN/HDRStageTool'
     #     user_email: '[email protected]'
     #     user_name: 'SuddyN'
     #     destination_branch: 'gh-pages'
 
-    - name: Upload full package to nightlies
+    - name: Upload full package to prereleases
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.RELEASE_TOKEN }}
         file: artifacts/*
         prerelease: false
         file_glob: true
         asset_name: artifacts
-        repo_name: HDR-Development/HDR-Nightlies
-        release_name: ${{ needs.version_and_changelog.outputs.version }}-nightly
+        repo_name: HDR-Development/HDR-PreReleases
+        release_name: ${{ needs.version_and_changelog.outputs.version }}-prerelease
         tag: ${{ needs.version_and_changelog.outputs.version }}
         overwrite: true
         body: ${{ needs.version_and_changelog.outputs.changelog }}
 
-  ################  handle the creation of to-nightly.zip  ################
-  to_nightly:
+  ################  handle the creation of to-prerelease.zip  ################
+  to_prerelease:
     runs-on: ubuntu-20.04
     needs: [full_package, version_and_changelog]
     steps:
     - name: checkout version
       uses: actions/[email protected]
 
-    # get the nightly
-    - id: latest_nightly
+    # get the prerelease
+    - id: latest_prerelease
       uses: robinraju/[email protected]
       with:
-        repository: "HDR-Development/HDR-Nightlies"
+        repository: "HDR-Development/HDR-PreReleases"
         tag: ${{ needs.version_and_changelog.outputs.version }}
         fileName: "switch-package.zip"
 
-    # move the nightly to the artifacts dir
+    # move the prerelease to the artifacts dir
     - run: mkdir artifacts && mv switch-package.zip artifacts
 
-    # build the to-nightly.zip
-    - name: make to-nightly.zip artifact
+    # build the to-prerelease.zip
+    - name: make to-prerelease.zip artifact
       run: |
         python3 scripts/make_diff.py beta
 
     - name: show upgrade artifacts
       run: |
         ls && stat * && echo && ls upgrade_artifacts && stat upgrade_artifacts/*
 
-    - run: mv upgrade_artifacts/upgrade.zip to-nightly.zip
+    - run: mv upgrade_artifacts/upgrade.zip to-prerelease.zip
 
-    - run: mv upgrade_artifacts/deletions.json to_nightly_deletions.json
+    - run: mv upgrade_artifacts/deletions.json to_prerelease_deletions.json
 
     # get the most recent latest beta
     - id: latest_beta
       uses: pozetroninc/github-action-get-latest-release@master
       with:
         repository: HDR-Development/HDR-Releases
 
-    # upload the to-nightly.zip to the beta for the launcher
-    - name: Upload to-nightly.zip to beta
+    # upload the to-prerelease.zip to the beta for the launcher
+    - name: Upload to-prerelease.zip to beta
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.RELEASE_TOKEN }}
-        file: to-nightly.zip
+        file: to-prerelease.zip
         prerelease: false
         file_glob: false
-        asset_name: to-nightly.zip
+        asset_name: to-prerelease.zip
         repo_name: HDR-Development/HDR-Releases
         tag: ${{ steps.latest_beta.outputs.release }}
         overwrite: true
 
-    # upload the to_nightly_deletions.json to the beta for the launcher
-    - name: Upload to_nightly_deletions.json to beta
+    # upload the to_prerelease_deletions.json to the beta for the launcher
+    - name: Upload to_prerelease_deletions.json to beta
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.RELEASE_TOKEN }}
-        file: to_nightly_deletions.json
+        file: to_prerelease_deletions.json
         prerelease: false
         file_glob: false
-        asset_name: to_nightly_deletions.json
+        asset_name: to_prerelease_deletions.json
         repo_name: HDR-Development/HDR-Releases
         tag: ${{ steps.latest_beta.outputs.release }}
         overwrite: true
@@ -363,7 +363,7 @@ jobs:
     # build the to-beta.zip
     - name: make to-beta.zip artifact
       run: |
-        python3 scripts/make_diff.py https://github.com/HDR-Development/HDR-Nightlies/releases/download/${{ needs.version_and_changelog.outputs.version }}/switch-package.zip
+        python3 scripts/make_diff.py https://github.com/HDR-Development/HDR-PreReleases/releases/download/${{ needs.version_and_changelog.outputs.version }}/switch-package.zip
 
     - name: show upgrade artifacts
       run: |
@@ -374,27 +374,27 @@ jobs:
     - run: mv upgrade_artifacts/deletions.json to_beta_deletions.json
 
     # upload the to-beta.zip to the beta for the launcher
-    - name: Upload to-beta.zip to nightly
+    - name: Upload to-beta.zip to prerelease
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.RELEASE_TOKEN }}
         file: to-beta.zip
         prerelease: false
         file_glob: false
         asset_name: to-beta.zip
-        repo_name: HDR-Development/HDR-Nightlies
+        repo_name: HDR-Development/HDR-PreReleases
         tag: ${{ needs.version_and_changelog.outputs.version }}
         overwrite: true
 
     # upload the to_beta_deletions.json to the beta for the launcher
-    - name: Upload to_beta_deletions.json to nightly
+    - name: Upload to_beta_deletions.json to prerelease
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.RELEASE_TOKEN }}
         file: to_beta_deletions.json
         prerelease: false
         file_glob: false
         asset_name: to_beta_deletions.json
-        repo_name: HDR-Development/HDR-Nightlies
+        repo_name: HDR-Development/HDR-PreReleases
         tag: ${{ needs.version_and_changelog.outputs.version }}
         overwrite: true
diff --git a/.github/workflows/publish_lvd_nightly.yml b/.github/workflows/publish_lvd_nightly.yml
diff --git a/scripts/get_build_type.py b/scripts/get_build_type.py
@@ -11,7 +11,7 @@
 pr_ref = (sys.argv[2] + " ").split(":")[1].strip()
 
 if pr_ref == 'stable' or (ref == 'refs/heads/dev' and pr_ref == ''):
-    print("nightly")
+    print("prerelease")
     exit()
 
 if ref == 'refs/heads/stable':

diff --git a/scripts/make_diff.py b/scripts/make_diff.py
@@ -6,21 +6,21 @@
 import zipfile
 import diff_lib
 
-#  this file diffs the existing switch-package.zip against whatever the latest nightly or
+#  this file diffs the existing switch-package.zip against whatever the latest prerelease or
 #  beta is, depending on arguments, and produces a upgrade.zip for that version to this
 #  version, as well as an deletions.json file with the files that should be deleted
 
 if "help" in sys.argv or "--help" in sys.argv or "-h" in sys.argv or len(sys.argv) != 2:
     if len(sys.argv) != 2:
         print("bad argument length!")
-    print("make_diff.py <nightly/beta>")
+    print("make_diff.py <prerelease/beta>")
     exit(0)
 
 if not os.path.exists("artifacts/switch-package.zip"):
     exit("package zip not found!")
 
-if sys.argv[1] == "nightly":
-    release_type = "Nightlies"
+if sys.argv[1] == "prerelease":
+    release_type = "PreReleases"
     url = "https://github.com/HDR-Development/HDR-" + release_type + "/releases/latest/download/switch-package.zip"
 elif sys.argv[1] == "beta":
     release_type = "Releases"