Skip to content

Commit 6512698

Browse files
committed
update release
1 parent 37dbc79 commit 6512698

1 file changed

Lines changed: 22 additions & 15 deletions

File tree

.github/workflows/release.yml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,24 +61,22 @@ jobs:
6161
if: matrix.BUILD_PLATFORM == 'x86'
6262
shell: pwsh
6363
run: |
64+
# Zkopírujeme celý Release/ output (exe, DLL, kiss/, font/ atd.)
65+
$src = "Release"
6466
$out = "remc2-win-x86"
65-
New-Item -ItemType Directory -Path $out | Out-Null
66-
Copy-Item "${{ env.SOLUTION_FILE_PATH }}\Release\remc2.exe" $out\ -ErrorAction SilentlyContinue
67-
Copy-Item "${{ env.SOLUTION_FILE_PATH }}\Release\remc2-editor.exe" $out\ -ErrorAction SilentlyContinue
68-
Copy-Item "config.json" $out\
69-
Copy-Item "Install Guide.txt" $out\
67+
Copy-Item $src $out -Recurse -Force
68+
Copy-Item "Install Guide.txt" "$out\"
7069
Compress-Archive -Path $out -DestinationPath "remc2-win-x86.zip"
7170
7271
- name: Package (zip) – x64
7372
if: matrix.BUILD_PLATFORM == 'x64'
7473
shell: pwsh
7574
run: |
75+
# Zkopírujeme celý x64\Release\ output (exe, DLL, kiss/, font/ atd.)
76+
$src = "x64\Release"
7677
$out = "remc2-win-x64"
77-
New-Item -ItemType Directory -Path $out | Out-Null
78-
Copy-Item "${{ env.SOLUTION_FILE_PATH }}\x64\Release\remc2.exe" $out\ -ErrorAction SilentlyContinue
79-
Copy-Item "${{ env.SOLUTION_FILE_PATH }}\x64\Release\remc2-editor.exe" $out\ -ErrorAction SilentlyContinue
80-
Copy-Item "config.json" $out\
81-
Copy-Item "Install Guide.txt" $out\
78+
Copy-Item $src $out -Recurse -Force
79+
Copy-Item "Install Guide.txt" "$out\"
8280
Compress-Archive -Path $out -DestinationPath "remc2-win-x64.zip"
8381
8482
- name: Upload artifact
@@ -120,19 +118,28 @@ jobs:
120118
name: remc2-win-${{ matrix.arch }}
121119
path: artifacts/${{ matrix.arch }}
122120

123-
- name: Unzip binaries
121+
- name: Unzip binaries into correct output path
124122
shell: pwsh
125123
run: |
126-
Expand-Archive "artifacts/${{ matrix.arch }}/remc2-win-${{ matrix.arch }}.zip" `
127-
-DestinationPath "staging/${{ matrix.arch }}"
124+
# WixSharp hledá binárky v cestě relativní od remc2-installer/:
125+
# x86 -> ..\Release # x64 -> ..d\Release Expand-Archive "artifacts/${{ matrix.arch }}/remc2-win-${{ matrix.arch }}.zip" `
126+
-DestinationPath "extracted"
127+
if ("${{ matrix.arch }}" -eq "x64") {
128+
New-Item -ItemType Directory -Path "x64\Release" -Force | Out-Null
129+
Copy-Item "extracted
130+
emc2-win-x64\*" "x64\Release" -Recurse -Force
131+
} else {
132+
New-Item -ItemType Directory -Path "Release" -Force | Out-Null
133+
Copy-Item "extracted
134+
emc2-win-x86\*" "Release" -Recurse -Force
135+
}
128136

129137
- name: Build installer
130138
shell: pwsh
131139
run: |
132140
dotnet build remc2-installer.sln `
133141
--configuration Release `
134-
-p:Platform=${{ matrix.arch }} `
135-
-p:GameBinPath="${{ github.workspace }}\staging\${{ matrix.arch }}\remc2-win-${{ matrix.arch }}"
142+
-p:Platform=${{ matrix.arch }}
136143
137144
- name: Locate & rename MSI
138145
shell: pwsh

0 commit comments

Comments
 (0)