Skip to content

Commit 7fbf675

Browse files
committed
ci: move upload of binaries to a separate workflow to be trigged manually
1 parent 3d0a2b9 commit 7fbf675

6 files changed

Lines changed: 77 additions & 187 deletions

File tree

.github/workflows/CI.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -61,29 +61,3 @@ jobs:
6161
with:
6262
lua-version: ${{ matrix.lua-version }}
6363
gtk-major-version: ${{ matrix.gtk-major-version }}
64-
65-
release:
66-
name: Release ${{ matrix.arch }}
67-
strategy:
68-
matrix:
69-
arch:
70-
- x64
71-
- x86
72-
73-
uses: ./.github/workflows/release.yaml
74-
if: ${{ github.ref_name == 'release' || startsWith(github.ref, 'refs/tags/') }}
75-
with:
76-
arch: ${{ matrix.arch }}
77-
needs:
78-
- lfs
79-
- lfs-arm64
80-
- lgi
81-
82-
release-arm64:
83-
name: Release arm64
84-
uses: ./.github/workflows/release-arm64.yaml
85-
if: ${{ github.ref_name == 'release' || startsWith(github.ref, 'refs/tags/') }}
86-
needs:
87-
- lfs
88-
- lfs-arm64
89-
- lgi

.github/workflows/lfs-arm64.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v4
2929
with:
3030
path: LuaInstaller
31-
31+
3232
- name: Set environment variables
3333
run: |
3434
$wpf_dir = Join-Path "${{ runner.temp }}" -ChildPath LuaInstaller.EndUsers;
@@ -83,11 +83,11 @@ jobs:
8383
Add-Content "${{ github.env }}" "LUA_DIR=${lua_dir}";
8484
Add-Content "${{ github.env }}" "LUAROCKS_DIR=${luarocks_dir}";
8585
Add-Content "${{ github.env }}" "LFS_TEST_FILE=${lfs_test_file}";
86-
86+
8787
- name: Test LuaInstaller.Console installing Lua ${{ inputs.lua-version }}
8888
run: |
8989
$console = Join-Path "${{ env.CONSOLE_DIR }}" -ChildPath "LuaInstaller.Console.exe";
90-
90+
9191
$commands = "/?", "list-win-sdk-arm64", "list-vs-arm64", "list-lua";
9292
$color = (0x1b -as [char]) + "[36m";
9393
@@ -100,53 +100,53 @@ jobs:
100100
}
101101
102102
Write-Host "command: ${color}install";
103-
103+
104104
& $console install `
105105
"dest-dir=${{ env.LUA_DIR }}" `
106106
arch=arm64 `
107107
"version=${{ inputs.lua-version }}";
108-
108+
109109
$luaBinDir = Join-Path -Path "${{ env.LUA_DIR }}" -ChildPath "bin";
110110
$luaExe = Join-Path -Path $luaBinDir -ChildPath "lua.exe";
111111
112112
& $luaExe -v
113113
114114
- name: Download LuaRocks
115115
run: Invoke-WebRequest -Uri https://luarocks.org/releases/luarocks-${{ env.LUAROCKS_VERSION }}-windows-32.zip -OutFile luarocks-${{ env.LUAROCKS_VERSION }}-windows-32.zip
116-
116+
117117
- name: Extract LuaRocks
118118
run: Expand-Archive luarocks-${{ env.LUAROCKS_VERSION }}-windows-32.zip -DestinationPath ([System.IO.Path]::GetDirectoryName("${{ env.LUAROCKS_DIR }}"))
119-
119+
120120
- name: Add Lua and LuaRocks to system PATH environment variable
121121
run: |
122122
$luaBinDir = Join-Path -Path "${{ env.LUA_DIR }}" -ChildPath "bin";
123123
124124
Add-Content "${{ github.path }}" "$luaBinDir";
125125
Add-Content "${{ github.path }}" "${{ env.LUAROCKS_DIR }}";
126-
126+
127127
- name: Setup MSVC dev-prompt for LuaRocks configuration
128128
uses: ilammy/msvc-dev-cmd@v1
129129
with:
130130
arch: arm64
131-
131+
132132
- name: Configure LuaRocks for Lua ${{ inputs.lua-version }}
133133
run: |
134134
luarocks config lua_dir "${{ env.LUA_DIR }}"
135-
135+
136136
$lua_short_version = "${{ inputs.lua-version }}" -split "\." |
137137
Select-Object -First 2 |
138138
Join-String -Separator ".";
139-
139+
140140
luarocks config lua_version $lua_short_version;
141-
141+
142142
- name: Update environment variables with variables from LuaRocks
143143
run: |
144144
$luarocks_path = luarocks.exe path
145145
Add-Content "${{ github.env }}" $luarocks_path.Replace("""", "").Replace("'", "").Replace("SET ", "")
146-
146+
147147
- name: Install LuaFileSystem
148148
run: luarocks install luafilesystem
149-
149+
150150
# https://lunarmodules.github.io/luafilesystem/examples.html
151151
- name: Create a Test file for LuaFileSystem
152152
run: |

.github/workflows/lfs.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
Write-Host "Arch not found";
2828
exit 1;
2929
}
30-
30+
3131
- name: Check lua-version input
3232
run: |
3333
if (-not ("${{ inputs.lua-version }}" -match "^(\d+)\.(\d+)(\.\d+)*$"))
@@ -95,11 +95,11 @@ jobs:
9595
Add-Content "${{ github.env }}" "LUA_DIR=${lua_dir}";
9696
Add-Content "${{ github.env }}" "LUAROCKS_DIR=${luarocks_dir}";
9797
Add-Content "${{ github.env }}" "LFS_TEST_FILE=${lfs_test_file}";
98-
98+
9999
- name: Test LuaInstaller.Console installing Lua ${{ inputs.lua-version }}
100100
run: |
101101
$console = Join-Path "${{ env.CONSOLE_DIR }}" -ChildPath "LuaInstaller.Console.exe";
102-
102+
103103
$commands = "/?", "list-win-sdk-${{ inputs.arch }}", "list-vs-${{ inputs.arch }}", "list-lua";
104104
$color = (0x1b -as [char]) + "[36m";
105105
@@ -112,53 +112,53 @@ jobs:
112112
}
113113
114114
Write-Host "command: ${color}install";
115-
115+
116116
& $console install `
117117
"dest-dir=${{ env.LUA_DIR }}" `
118118
arch=${{ inputs.arch }} `
119119
"version=${{ inputs.lua-version }}";
120-
120+
121121
$luaBinDir = Join-Path -Path "${{ env.LUA_DIR }}" -ChildPath "bin";
122122
$luaExe = Join-Path -Path $luaBinDir -ChildPath "lua.exe";
123123
124124
& $luaExe -v
125125
126126
- name: Download LuaRocks
127127
run: Invoke-WebRequest -Uri https://luarocks.org/releases/luarocks-${{ env.LUAROCKS_VERSION }}-windows-64.zip -OutFile luarocks-${{ env.LUAROCKS_VERSION }}-windows-64.zip
128-
128+
129129
- name: Extract LuaRocks
130130
run: Expand-Archive luarocks-${{ env.LUAROCKS_VERSION }}-windows-64.zip -DestinationPath ([System.IO.Path]::GetDirectoryName("${{ env.LUAROCKS_DIR }}"))
131-
131+
132132
- name: Add Lua and LuaRocks to system PATH environment variable
133133
run: |
134134
$luaBinDir = Join-Path -Path "${{ env.LUA_DIR }}" -ChildPath "bin";
135135
136136
Add-Content "${{ github.path }}" "$luaBinDir";
137137
Add-Content "${{ github.path }}" "${{ env.LUAROCKS_DIR }}";
138-
138+
139139
- name: Setup MSVC dev-prompt for LuaRocks configuration
140140
uses: ilammy/msvc-dev-cmd@v1
141141
with:
142142
arch: ${{ inputs.arch }}
143-
143+
144144
- name: Configure LuaRocks for Lua ${{ inputs.lua-version }}
145145
run: |
146146
luarocks config lua_dir "${{ env.LUA_DIR }}"
147-
147+
148148
$lua_short_version = "${{ inputs.lua-version }}" -split "\." |
149149
Select-Object -First 2 |
150150
Join-String -Separator ".";
151-
151+
152152
luarocks config lua_version $lua_short_version;
153-
153+
154154
- name: Update environment variables with variables from LuaRocks
155155
run: |
156156
$luarocks_path = luarocks.exe path
157157
Add-Content "${{ github.env }}" $luarocks_path.Replace("""", "").Replace("'", "").Replace("SET ", "")
158-
158+
159159
- name: Install LuaFileSystem
160160
run: luarocks install luafilesystem
161-
161+
162162
# https://lunarmodules.github.io/luafilesystem/examples.html
163163
- name: Create a Test file for LuaFileSystem
164164
run: |

.github/workflows/lgi.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ on:
1414
env:
1515
ARCH: x64
1616
WINGTK_URL: https://github.com/wingtk/gvsbuild/releases/download/2025.4.1/GTK${{ inputs.gtk-major-version }}_Gvsbuild_2025.4.1_x64.zip
17-
17+
1818
jobs:
1919
build:
2020
runs-on: windows-latest
2121
name: Build
22-
22+
2323
steps:
2424

2525
- name: Check gtk-major-version input
@@ -41,30 +41,30 @@ jobs:
4141
- name: Download and extract GTK ${{ inputs.gtk-major-version }} prebuilt binaries (MSVC toolset) provided by wingtk
4242
run: |
4343
$gtk_zip_file = Join-Path -Path "${{ runner.temp }}" -ChildPath "gtk.zip";
44-
44+
4545
# Download
4646
Invoke-WebRequest -Uri ${{ env.WINGTK_URL }} -OutFile $gtk_zip_file;
47-
47+
4848
# Unzip
4949
$gtk_dir = Join-Path -Path "${{ runner.temp }}" -ChildPath "gtk";
5050
Expand-Archive -Path $gtk_zip_file -DestinationPath "${gtk_dir}";
5151
5252
$gtk_bin_dir = Join-Path -Path $gtk_dir -ChildPath "bin";
53-
53+
5454
# Set environment variable GTK_DIR pointing to GTK's directory
5555
Add-Content "${{ github.env }}" "GTK_DIR=${gtk_dir}";
56-
56+
5757
# Set environment variable GTK_BIN_DIR pointing to GTK's bin directory
5858
Add-Content "${{ github.env }}" "GTK_BIN_DIR=${gtk_bin_dir}";
5959
6060
# Place GTK bin directory on system PATH environment variable
6161
Add-Content "${{ github.path }}" "${gtk_bin_dir}";
62-
62+
6363
- name: Checkout LuaInstaller
6464
uses: actions/checkout@v4
6565
with:
6666
path: LuaInstaller
67-
67+
6868
- name: Install Lua ${{ inputs.lua-version }} on GTK's directory through LuaInstaller.Console, and set environment variables
6969
run: |
7070
$console_dir = Join-Path "${{ runner.temp }}" -ChildPath LuaInstaller.Console;
@@ -78,26 +78,26 @@ jobs:
7878
7979
Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile $dotnet_install_file;
8080
& $dotnet_install_file -Architecture "${{ env.ARCH }}" -Version "6.0.427" -InstallDir $dotnet_dir;
81-
81+
8282
& $dotnet_runner `
8383
restore LuaInstaller\LuaInstaller.sln;
84-
84+
8585
& $dotnet_runner `
8686
publish LuaInstaller\LuaInstaller.Console\LuaInstaller.Console.csproj `
8787
-o "${console_dir}" `
8888
-c Release `
8989
-r win-${{ env.ARCH }} `
9090
--self-contained true;
91-
91+
9292
$console = Join-Path -Path "${console_dir}" -ChildPath "LuaInstaller.Console.exe";
93-
93+
9494
& $console install `
9595
"dest-dir=${{ env.GTK_DIR }}" `
9696
arch=${{ env.ARCH }} `
9797
"version=${{ inputs.lua-version }}";
98-
98+
9999
& lua -v;
100-
100+
101101
$lua_pc = Get-ChildItem "${{ env.GTK_DIR }}" -Recurse -File |
102102
Where-Object Name -Like "lua*.pc" |
103103
Select-Object -ExpandProperty BaseName -First 1;
@@ -108,10 +108,10 @@ jobs:
108108
$lua_short_version = "${{ inputs.lua-version }}" -split "\." |
109109
Select-Object -First 2 |
110110
Join-String -Separator ".";
111-
111+
112112
# Append LUA_SHORT_VERSION environment variable to help LuaRocks configuration, when needed.
113113
Add-Content "${{ github.env }}" "LUA_SHORT_VERSION=${lua_short_version}";
114-
114+
115115
# Initial lgi setup (checkout + Python 3.12 + meson + ninja)
116116
- name: Checkout lgi
117117
uses: actions/checkout@v4
@@ -123,22 +123,22 @@ jobs:
123123
uses: actions/setup-python@v5
124124
with:
125125
python-version: '3.12'
126-
126+
127127
- name: Install meson
128128
run: pip install meson
129-
129+
130130
- name: Install ninja
131131
run: pip install ninja
132132

133133
- name: Setup MSVC dev-prompt
134134
uses: ilammy/msvc-dev-cmd@v1
135-
135+
136136
- name: Configure lgi through meson
137137
run: meson setup build-lgi lgi --prefix "${{ env.GTK_DIR }}" --buildtype release "-Dlua-pc=${{ env.LUA_PC }}" -Dtests=false
138-
138+
139139
- name: Build lgi
140140
run: meson compile -C build-lgi
141-
141+
142142
- name: Install lgi
143143
run: meson install -C build-lgi
144144

@@ -170,7 +170,7 @@ jobs:
170170
171171
app:run()
172172
'@;
173-
173+
174174
$test_file = Join-Path -Path "${{ runner.temp }}" -ChildPath "small-lgi-test.lua";
175175
176176
Set-Content $test_file $test_script -NoNewLine;

0 commit comments

Comments
 (0)