Skip to content

Commit 938ea4d

Browse files
deaviddeavid
authored
Merge pull request #190 from deavid/dev-deavid
Dev deavid
2 parents 2967401 + 833b73c commit 938ea4d

69 files changed

Lines changed: 399 additions & 95 deletions

File tree

Some content is hidden

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

‎.github/workflows/release-alpha.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
permissions:
99
contents: write
10+
actions: write
1011

1112
jobs:
1213
prepare_assets:
@@ -134,3 +135,8 @@ jobs:
134135
--notes "Latest alpha build from the alpha branch. Volatile. May break." \
135136
releases/unhaunter-*
136137
gh release edit alpha-latest --repo ${{ github.repository }} --latest=false
138+
139+
- name: Trigger Website Deployment
140+
run: gh workflow run deploy-zola-site.yml --ref website
141+
env:
142+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release-beta.yml‎

Lines changed: 89 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,81 @@ on:
77

88
permissions:
99
contents: write # Required for gh release upload
10+
actions: write # Required to trigger the website deployment
1011

1112
jobs:
12-
release:
13+
prepare_assets:
1314
runs-on: ubuntu-latest
1415
steps:
15-
- name: Checkout code (tagged commit)
16+
- name: Checkout code
1617
uses: actions/checkout@v4
17-
with:
18-
ref: ${{ github.ref_name }} # Checkout the specific tag
1918

20-
- name: Update APT
19+
- name: Update APT & Install Build Dependencies
2120
run: |
2221
sudo apt-get update
22+
sudo apt-get install -y imagemagick bc xbrzscale
2323
24-
- name: Install Linux Build Dependencies (if any)
25-
run: |
26-
sudo apt-get install -y g++ pkg-config libx11-dev libasound2-dev libudev-dev libxkbcommon-x11-0 imagemagick bc xbrzscale
24+
- name: Set up Rust
25+
uses: dtolnay/rust-toolchain@stable
26+
with:
27+
toolchain: stable
28+
29+
- name: Restore Cargo cache
30+
uses: Swatinem/rust-cache@v2
2731

28-
- name: Install Windows Cross-Compile Dependencies (mingw)
32+
- name: Cache upscaled assets
33+
uses: actions/cache@v4
34+
with:
35+
path: |
36+
assets/upscaled
37+
assets/index.postcard
38+
key: ${{ runner.os }}-assets-${{ hashFiles('assets/img/**', 'upscale_assets.sh') }}
39+
restore-keys: |
40+
${{ runner.os }}-assets-
41+
42+
- name: Install just
43+
uses: extractions/setup-just@v3
44+
45+
- name: Process assets
46+
run: just upscale-assets
47+
48+
- name: Upload processed assets
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: processed-assets-beta
52+
path: assets/
53+
include-hidden-files: true
54+
55+
build_and_package:
56+
runs-on: ubuntu-latest
57+
needs: [prepare_assets]
58+
strategy:
59+
fail-fast: false
60+
matrix:
61+
include:
62+
- id: linux
63+
just_target: package-linux
64+
- id: windows
65+
just_target: package-windows
66+
- id: wasm
67+
just_target: package-wasm
68+
- id: server
69+
just_target: package-server
70+
71+
steps:
72+
- name: Checkout code
73+
uses: actions/checkout@v4
74+
75+
- name: Download processed assets
76+
uses: actions/download-artifact@v4
77+
with:
78+
name: processed-assets-beta
79+
path: assets/
80+
81+
- name: Update APT & Install Build Dependencies
2982
run: |
30-
sudo apt-get install -y mingw-w64 zip
83+
sudo apt-get update
84+
sudo apt-get install -y g++ pkg-config libx11-dev libasound2-dev libudev-dev libxkbcommon-x11-0 mingw-w64 zip imagemagick bc xbrzscale
3185
3286
- name: Install WASM deps
3387
run: |
@@ -45,18 +99,28 @@ jobs:
4599
- name: Install just
46100
uses: extractions/setup-just@v3
47101

48-
- name: Build and Package Linux
49-
run: just package-linux
50-
51-
- name: Build and Package Windows
52-
run: just package-windows
53-
54-
- name: Build and Package WASM
55-
run: just package-wasm
102+
- name: Build and Package
103+
env:
104+
SKIP_UPSCALE: 1
105+
run: just ${{ matrix.just_target }}
56106

57-
- name: Build and Package Server
58-
run: just package-server
107+
- name: Upload release artifacts
108+
uses: actions/upload-artifact@v4
109+
with:
110+
name: beta-${{ matrix.id }}
111+
path: releases/unhaunter-*
112+
if-no-files-found: error
59113

114+
publish:
115+
runs-on: ubuntu-latest
116+
needs: [build_and_package]
117+
steps:
118+
- name: Download all artifacts
119+
uses: actions/download-artifact@v4
120+
with:
121+
pattern: beta-*
122+
merge-multiple: true
123+
path: releases
60124

61125
- name: Create GitHub Pre-Release and Upload Artifacts
62126
env:
@@ -68,3 +132,8 @@ jobs:
68132
--title "Pre-release Unhaunter Beta $TAG_NAME" \
69133
--notes "Beta release build based on tag $TAG_NAME" \
70134
releases/unhaunter-*
135+
136+
- name: Trigger Website Deployment
137+
run: gh workflow run deploy-zola-site.yml --ref website
138+
env:
139+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release-main.yml‎

Lines changed: 101 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,85 @@ name: Release Main Build
33
on:
44
push:
55
tags:
6-
- 'v[0-9]+\.[0-9]+\.[0-9]+' # MODIFIED: Trigger on final version tags like v0.3.0 (no hyphens)
6+
- 'v[0-9]+\.[0-9]+\.[0-9]+' # Trigger on final version tags like v0.3.0
77

88
permissions:
99
contents: write # Required for gh release upload
10+
actions: write # Required to trigger the website deployment
1011

1112
jobs:
12-
release:
13+
prepare_assets:
1314
runs-on: ubuntu-latest
1415
steps:
15-
- name: Checkout code (tagged commit)
16+
- name: Checkout code
1617
uses: actions/checkout@v4
17-
with:
18-
ref: ${{ github.ref_name }} # Checkout the specific tag
19-
fetch-depth: 0 # Fetch all history to allow changelog extraction / access to tag messages
2018

21-
- name: Update APT
19+
- name: Update APT & Install Build Dependencies
2220
run: |
2321
sudo apt-get update
22+
sudo apt-get install -y imagemagick bc xbrzscale
2423
25-
- name: Install Linux Build Dependencies (if any)
26-
run: |
27-
sudo apt-get install -y g++ pkg-config libx11-dev libasound2-dev libudev-dev libxkbcommon-x11-0 imagemagick bc xbrzscale
24+
- name: Set up Rust
25+
uses: dtolnay/rust-toolchain@stable
26+
with:
27+
toolchain: stable
28+
29+
- name: Restore Cargo cache
30+
uses: Swatinem/rust-cache@v2
31+
32+
- name: Cache upscaled assets
33+
uses: actions/cache@v4
34+
with:
35+
path: |
36+
assets/upscaled
37+
assets/index.postcard
38+
key: ${{ runner.os }}-assets-${{ hashFiles('assets/img/**', 'upscale_assets.sh') }}
39+
restore-keys: |
40+
${{ runner.os }}-assets-
41+
42+
- name: Install just
43+
uses: extractions/setup-just@v3
44+
45+
- name: Process assets
46+
run: just upscale-assets
47+
48+
- name: Upload processed assets
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: processed-assets-main
52+
path: assets/
53+
include-hidden-files: true
54+
55+
build_and_package:
56+
runs-on: ubuntu-latest
57+
needs: [prepare_assets]
58+
strategy:
59+
fail-fast: false
60+
matrix:
61+
include:
62+
- id: linux
63+
just_target: package-linux
64+
- id: windows
65+
just_target: package-windows
66+
- id: wasm
67+
just_target: package-wasm
68+
- id: server
69+
just_target: package-server
70+
71+
steps:
72+
- name: Checkout code
73+
uses: actions/checkout@v4
74+
75+
- name: Download processed assets
76+
uses: actions/download-artifact@v4
77+
with:
78+
name: processed-assets-main
79+
path: assets/
2880

29-
- name: Install Windows Cross-Compile Dependencies (mingw)
81+
- name: Update APT & Install Build Dependencies
3082
run: |
31-
sudo apt-get install -y mingw-w64 zip
83+
sudo apt-get update
84+
sudo apt-get install -y g++ pkg-config libx11-dev libasound2-dev libudev-dev libxkbcommon-x11-0 mingw-w64 zip imagemagick bc xbrzscale
3285
3386
- name: Install WASM deps
3487
run: |
@@ -40,9 +93,34 @@ jobs:
4093
toolchain: stable
4194
target: x86_64-pc-windows-gnu,wasm32-unknown-unknown
4295

96+
- name: Restore Cargo cache
97+
uses: Swatinem/rust-cache@v2
98+
4399
- name: Install just
44100
uses: extractions/setup-just@v3
45101

102+
- name: Build and Package
103+
env:
104+
SKIP_UPSCALE: 1
105+
run: just ${{ matrix.just_target }}
106+
107+
- name: Upload release artifacts
108+
uses: actions/upload-artifact@v4
109+
with:
110+
name: main-${{ matrix.id }}
111+
path: releases/unhaunter-*
112+
if-no-files-found: error
113+
114+
publish:
115+
runs-on: ubuntu-latest
116+
needs: [build_and_package]
117+
steps:
118+
- name: Checkout code (tagged commit)
119+
uses: actions/checkout@v4
120+
with:
121+
ref: ${{ github.ref_name }}
122+
fetch-depth: 0
123+
46124
- name: Get version from tag
47125
id: get_version
48126
run: echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
@@ -62,20 +140,12 @@ jobs:
62140
echo "RELEASE_NOTES=$NOTES" >> $GITHUB_OUTPUT
63141
shell: bash
64142

65-
- name: Restore Cargo cache
66-
uses: Swatinem/rust-cache@v2
67-
68-
- name: Build and Package Linux
69-
run: just package-linux
70-
71-
- name: Build and Package Windows
72-
run: just package-windows
73-
74-
- name: Build and Package WASM
75-
run: just package-wasm
76-
77-
- name: Build and Package Server
78-
run: just package-server
143+
- name: Download all artifacts
144+
uses: actions/download-artifact@v4
145+
with:
146+
pattern: main-*
147+
merge-multiple: true
148+
path: releases
79149

80150
- name: Create GitHub Release and Upload Artifacts
81151
env:
@@ -88,3 +158,8 @@ jobs:
88158
--title "Unhaunter ${{ steps.get_version.outputs.VERSION }}" \
89159
--notes "$RELEASE_NOTES" \
90160
releases/unhaunter-*
161+
162+
- name: Trigger Website Deployment
163+
run: gh workflow run deploy-zola-site.yml --ref website
164+
env:
165+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎assets/index/reverbs-ogg.assetidx‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
reverbs/ambient-clean.ogg
2+
reverbs/background-noise-birds-1.ogg
3+
reverbs/background-noise-house-1.ogg
4+
reverbs/birds-clean.ogg
5+
reverbs/breaker_trip.ogg
6+
reverbs/door-close.ogg
7+
reverbs/door-open.ogg
8+
reverbs/door_creak_slow.ogg
9+
reverbs/door_lock_heavy.ogg
10+
reverbs/effects-chirp-base.ogg
11+
reverbs/effects-chirp-click.ogg
12+
reverbs/effects-chirp-high.ogg
13+
reverbs/effects-chirp-short.ogg
14+
reverbs/effects-chirp-shorter.ogg
15+
reverbs/effects-dingdingding.ogg
16+
reverbs/effects-dongdongdong.ogg
17+
reverbs/effects-radio-answer1.ogg
18+
reverbs/effects-radio-answer2.ogg
19+
reverbs/effects-radio-answer3.ogg
20+
reverbs/effects-radio-answer4.ogg
21+
reverbs/effects-radio-scan.ogg
22+
reverbs/fadein-progress-1000ms.ogg
23+
reverbs/fadein-progress-1500ms.ogg
24+
reverbs/ghost-effect-1.ogg
25+
reverbs/ghost-effect-2.ogg
26+
reverbs/ghost-effect-3.ogg
27+
reverbs/ghost-effect-4.ogg
28+
reverbs/ghost-roar-1.ogg
29+
reverbs/ghost-roar-2.ogg
30+
reverbs/ghost-roar-3.ogg
31+
reverbs/ghost-roar-4.ogg
32+
reverbs/ghost-snore-1.ogg
33+
reverbs/ghost-snore-2.ogg
34+
reverbs/ghost-snore-3.ogg
35+
reverbs/ghost-snore-4.ogg
36+
reverbs/heartbeat-1.ogg
37+
reverbs/heartbeat-2.ogg
38+
reverbs/hide-rustle.ogg
39+
reverbs/impact_glass_shatter.ogg
40+
reverbs/impact_metal_clink.ogg
41+
reverbs/impact_wood_thud.ogg
42+
reverbs/insane-1.ogg
43+
reverbs/invalid-action-buzz.ogg
44+
reverbs/item-drop-clunk-1.ogg
45+
reverbs/item-drop-clunk.ogg
46+
reverbs/item-move-scrape.ogg
47+
reverbs/item-pickup-whoosh.ogg
48+
reverbs/object_drag_wood.ogg
49+
reverbs/object_nudge_1.ogg
50+
reverbs/object_throw_generic.ogg
51+
reverbs/quartz_crack.ogg
52+
reverbs/radio-off-zzt.ogg
53+
reverbs/radio-on-zzt.ogg
54+
reverbs/sage_activation.ogg
55+
reverbs/salt_drop.ogg
56+
reverbs/switch-off-1.ogg
57+
reverbs/switch-on-1.ogg
58+
reverbs/switch-on-2.ogg

‎assets/reverbs/ambient-clean.ogg‎

492 KB
Binary file not shown.

‎assets/reverbs/background-noise-birds-1.ogg‎

534 KB
Binary file not shown.

‎assets/reverbs/background-noise-house-1.ogg‎

2.13 MB
Binary file not shown.

‎assets/reverbs/birds-clean.ogg‎

215 KB
Binary file not shown.

‎assets/reverbs/breaker_trip.ogg‎

9.22 KB
Binary file not shown.

‎assets/reverbs/door-close.ogg‎

15.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)