diff --git a/.github/workflows/build_beta.yml b/.github/workflows/build_beta.yml index d46a73a02f..e37a0d2bf0 100644 --- a/.github/workflows/build_beta.yml +++ b/.github/workflows/build_beta.yml @@ -267,27 +267,27 @@ 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/checkout@v4.1.4 - # download the nightly - - id: latest_nightly + # download the prerelease + - id: latest_prerelease uses: robinraju/release-downloader@v1.7 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 @@ -295,9 +295,9 @@ jobs: 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 @@ -305,28 +305,28 @@ jobs: 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 b/.github/workflows/build_prerelease.yml similarity index 86% rename from .github/workflows/build_nightly.yml rename to .github/workflows/build_prerelease.yml index cc65771b10..7ff4542dbc 100644 --- a/.github/workflows/build_nightly.yml +++ b/.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,13 +256,13 @@ 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: 'suddy121800@hotmail.com' # 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 }} @@ -270,33 +270,33 @@ jobs: 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/checkout@v4.1.4 - # get the nightly - - id: latest_nightly + # get the prerelease + - id: latest_prerelease uses: robinraju/release-downloader@v1.7 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 @@ -304,9 +304,9 @@ jobs: 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 @@ -314,28 +314,28 @@ jobs: 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,7 +374,7 @@ 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 }} @@ -382,12 +382,12 @@ jobs: 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 }} @@ -395,6 +395,6 @@ jobs: 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 deleted file mode 100644 index 2dff5f91b0..0000000000 --- a/.github/workflows/publish_lvd_nightly.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: publish_lvd_nightly.yml - -on: - workflow_run: - workflows: [build_nightly] - types: - - completed - -jobs: - # bump the version and build the changelog - - ############## handle the creasion of the full package installation ############## - lvd_publish: - runs-on: windows-latest - steps: - - name: checkout version - uses: actions/checkout@v4.1.4 - - - id: romfs_zip - uses: robinraju/release-downloader@v1.8 - with: - repository: "HDR-Development/romfs-release" - latest: true - zipBall: true - - - id: yamlvd_exe - uses: robinraju/release-downloader@v1.8 - with: - repository: "ultimate-research/lvd-rs" - tag: v0.3.0 - fileName: "yamlvd.exe" - - - name: lvd_to_yml - run: | - 7z x romfs.zip - mkdir yml - python3 scripts/lvd-to-yml.py .\yamlvd.exe .\ultimate\mods\hdr-stages\stage\ .\ - - - name: view_results - run: | - ls -R - - - name: Push lvd file to Suddy's HDRStageTools - run: | - git config --global user.email "suddy121800@hotmail.com" - git config --global user.name "SuddyN" - git clone -b gh-pages https://.:${{ secrets.API_TOKEN_GITHUB_HDRSTAGETOOL }}@github.com/SuddyN/HDRStageTools HDRStageTools - copy lvd.zip HDRStageTools/lvd/hdr-nightly/lvd.zip - cd HDRStageTools - git add . - git diff-index --quiet HEAD || git commit -m "Automatic publish from HDR-Development/HewDraw-Remix" - git push origin gh-pages diff --git a/scripts/get_build_type.py b/scripts/get_build_type.py index 85809ce8fd..ca123918bb 100755 --- 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 index 73d3cb347c..b94451bf22 100644 --- 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 ") + print("make_diff.py ") 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"