Skip to content

Commit babbbc3

Browse files
SkewedAskewSkewedAskew
committed
Merge branch 'dev' into sephiroth-again-again
1 parent c511692 commit babbbc3

File tree

710 files changed

+37895
-12256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

710 files changed

+37895
-12256
lines changed

‎.github/workflows/build_beta.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292

9393
# build the project
9494
- run: |
95-
cd scripts && python3 make_dist.py build version=${{ steps.trimmed_tag.outputs.tag }}-beta name=hdr && cd ..
95+
cd scripts && NO_RUST_NIGHTLY=1 python3 make_dist.py build version=${{ steps.trimmed_tag.outputs.tag }}-beta name=hdr && cd ..
9696
env:
9797
HOME: /root
9898
@@ -106,7 +106,7 @@ jobs:
106106
uses: actions/upload-artifact@v3
107107
with:
108108
name: version
109-
path: plugin/hdr_version.txt
109+
path: hdr_version.txt
110110

111111
- uses: dev-drprasad/delete-tag-and-release@master
112112
with:
@@ -115,6 +115,10 @@ jobs:
115115
env:
116116
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
117117

118+
- name: Sleep to ensure tag gets deleted
119+
uses: jakejarvis/wait-action@master
120+
with:
121+
time: '60s'
118122

119123
# upload asset
120124
- name: Upload binaries to release

‎.github/workflows/build_nightly.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100

101101
# build the project
102102
- run: |
103-
cd scripts && python3 make_dist.py build version=${{ needs.version_and_changelog.outputs.version }}-nightly name=hdr && cd ..
103+
cd scripts && NO_RUST_NIGHTLY=1 python3 make_dist.py build version=${{ needs.version_and_changelog.outputs.version }}-nightly name=hdr && cd ..
104104
env:
105105
HOME: /root
106106
@@ -114,7 +114,7 @@ jobs:
114114
uses: actions/upload-artifact@v3
115115
with:
116116
name: version
117-
path: plugin/hdr_version.txt
117+
path: hdr_version.txt
118118

119119
- name: Upload distributions artifact
120120
uses: actions/upload-artifact@v3

‎.github/workflows/pr_build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
# build the project
3232
- run: |
33-
cd scripts && python3 make_dist.py build version=1.69.420-pr name=hdr-pr && cd ..
33+
cd scripts && NO_RUST_NIGHTLY=1 python3 make_dist.py build version=1.69.420-pr name=hdr-pr && cd ..
3434
env:
3535
HOME: /root
3636

‎.github/workflows/publish_lvd_beta.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: publish_lvd_beta.yml
2+
3+
on:
4+
workflow_run:
5+
workflows: [make beta]
6+
types:
7+
- completed
8+
9+
jobs:
10+
# bump the version and build the changelog
11+
12+
############## handle the creasion of the full package installation ##############
13+
lvd_publish:
14+
runs-on: windows-latest
15+
steps:
16+
- name: checkout version
17+
uses: actions/checkout@v2
18+
19+
- id: romfs_zip
20+
uses: robinraju/release-downloader@v1.8
21+
with:
22+
repository: "HDR-Development/romfs-release"
23+
latest: true
24+
zipBall: true
25+
26+
- id: yamlvd_exe
27+
uses: robinraju/release-downloader@v1.8
28+
with:
29+
repository: "ultimate-research/lvd-rs"
30+
tag: v0.3.0
31+
fileName: "yamlvd.exe"
32+
33+
- name: lvd_to_yml
34+
run: |
35+
7z x romfs.zip
36+
mkdir yml
37+
python3 scripts/lvd-to-yml.py .\yamlvd.exe .\ultimate\mods\hdr-stages\stage\ .\
38+
39+
- name: view_results
40+
run: |
41+
ls -R
42+
43+
- name: Push lvd file to Suddy's HDRStageTools
44+
run: |
45+
git config --global user.email "suddy121800@hotmail.com"
46+
git config --global user.name "SuddyN"
47+
git clone -b gh-pages https://.:${{ secrets.API_TOKEN_GITHUB_HDRSTAGETOOL }}@github.com/SuddyN/HDRStageTools HDRStageTools
48+
copy lvd.zip HDRStageTools/lvd/hdr-beta/lvd.zip
49+
cd HDRStageTools
50+
git add .
51+
git diff-index --quiet HEAD || git commit -m "Automatic publish from HDR-Development/HewDraw-Remix"
52+
git push origin gh-pages

‎.github/workflows/publish_lvd_nightly.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: publish_lvd_nightly.yml
2+
3+
on:
4+
workflow_run:
5+
workflows: [build_nightly]
6+
types:
7+
- completed
8+
9+
jobs:
10+
# bump the version and build the changelog
11+
12+
############## handle the creasion of the full package installation ##############
13+
lvd_publish:
14+
runs-on: windows-latest
15+
steps:
16+
- name: checkout version
17+
uses: actions/checkout@v2
18+
19+
- id: romfs_zip
20+
uses: robinraju/release-downloader@v1.8
21+
with:
22+
repository: "HDR-Development/romfs-release"
23+
latest: true
24+
zipBall: true
25+
26+
- id: yamlvd_exe
27+
uses: robinraju/release-downloader@v1.8
28+
with:
29+
repository: "ultimate-research/lvd-rs"
30+
tag: v0.3.0
31+
fileName: "yamlvd.exe"
32+
33+
- name: lvd_to_yml
34+
run: |
35+
7z x romfs.zip
36+
mkdir yml
37+
python3 scripts/lvd-to-yml.py .\yamlvd.exe .\ultimate\mods\hdr-stages\stage\ .\
38+
39+
- name: view_results
40+
run: |
41+
ls -R
42+
43+
- name: Push lvd file to Suddy's HDRStageTools
44+
run: |
45+
git config --global user.email "suddy121800@hotmail.com"
46+
git config --global user.name "SuddyN"
47+
git clone -b gh-pages https://.:${{ secrets.API_TOKEN_GITHUB_HDRSTAGETOOL }}@github.com/SuddyN/HDRStageTools HDRStageTools
48+
copy lvd.zip HDRStageTools/lvd/hdr-nightly/lvd.zip
49+
cd HDRStageTools
50+
git add .
51+
git diff-index --quiet HEAD || git commit -m "Automatic publish from HDR-Development/HewDraw-Remix"
52+
git push origin gh-pages

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ scripts/change_summary.txt
1111
scripts/log.txt
1212
scripts/tmp
1313
rust-toolchain
14-
plugin/hdr_version.txt
14+
**/hdr_version.txt
1515
**/*.zip
1616
**/*package/
1717
**/zips/

0 commit comments

Comments
 (0)