Skip to content

Commit 74ae756

Browse files
committed
chore: rename tmp dir -> out
1 parent 070aa63 commit 74ae756

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

.github/workflows/build.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@ jobs:
3434
shared-key: ${{ matrix.rust-target }}-${{ hashFiles('Cargo.lock') }}
3535

3636
- name: Create output directories
37-
run: mkdir tmp/noconsole tmp/console
37+
run: mkdir out/noconsole out/console
3838

3939
- name: Build (windows subsystem)
4040
env:
4141
VERSION_NUMBER: ${{ inputs.version-number || '0.0.0' }}
4242
run: |
4343
cargo build --locked --release --target ${{ matrix.rust-target }} --features no_console
44-
mv target/${{ matrix.rust-target }}/release/{wm,watcher}.exe tmp/noconsole
44+
mv target/${{ matrix.rust-target }}/release/{wm,watcher}.exe out/noconsole
4545
4646
- name: Build (console subsystem)
4747
env:
4848
VERSION_NUMBER: ${{ inputs.version-number || '0.0.0' }}
4949
run: |
5050
cargo build --locked --release --target ${{ matrix.rust-target }}
51-
mv target/${{ matrix.rust-target }}/release/{wm,watcher}.exe tmp/console
51+
mv target/${{ matrix.rust-target }}/release/{wm,watcher}.exe out/console
5252
5353
- uses: actions/upload-artifact@v4
5454
with:
5555
name: executables-${{ matrix.rust-target }}
5656
if-no-files-found: error
57-
path: tmp/**
57+
path: out/**

.github/workflows/package.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
uses: actions/download-artifact@v4
2424
with:
2525
name: executables-*
26-
path: tmp/
26+
path: out/
2727

2828
- name: Download Zebar installers
2929
run: |
3030
$latestRelease = 'https://api.github.com/repos/glzr-io/zebar/releases/latest'
3131
$latestInstallers = Invoke-RestMethod $latestRelease | % assets | ? name -like "*.msi"
32-
$latestInstallers | % { Invoke-WebRequest $_.browser_download_url -OutFile (Join-Path "tmp" $_.name) }
32+
$latestInstallers | % { Invoke-WebRequest $_.browser_download_url -OutFile (Join-Path "out" $_.name) }
3333
3434
- name: Install WiX and its extensions
3535
run: |
@@ -39,23 +39,23 @@ jobs:
3939
- name: Create MSI installer (x64)
4040
run: |
4141
wix build -arch "x64" -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext \
42-
-out "./tmp/installer-x64.msi" "./resources/wix/standalone.wxs" "./resources/wix/standalone-ui.wxs" \
42+
-out "./out/installer-x64.msi" "./resources/wix/standalone.wxs" "./resources/wix/standalone-ui.wxs" \
4343
-d VERSION_NUMBER="${{ needs.next-version.outputs.new-release-version }}"
4444
4545
- name: Create MSI installer (arm64)
4646
run: |
4747
wix build -arch "arm64" -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext \
48-
-out "./tmp/installer-arm64.msi" "./resources/wix/standalone.wxs" "./resources/wix/standalone-ui.wxs" \
48+
-out "./out/installer-arm64.msi" "./resources/wix/standalone.wxs" "./resources/wix/standalone-ui.wxs" \
4949
-d VERSION_NUMBER="${{ needs.next-version.outputs.new-release-version }}"
5050
5151
- name: Create universal installer
5252
run: |
5353
wix build -arch "x64" -ext WixToolset.BootstrapperApplications.wixext \
54-
-out "./tmp/installer-universal.exe" "./resources/wix/bundle.wxs" \
54+
-out "./out/installer-universal.exe" "./resources/wix/bundle.wxs" \
5555
-d VERSION_NUMBER="${{ needs.next-version.outputs.new-release-version }}"
5656
5757
- uses: actions/upload-artifact@v4
5858
with:
5959
name: installers
6060
if-no-files-found: error
61-
path: tmp/installer-*
61+
path: out/installer-*

.github/workflows/release.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/download-artifact@v4
3333
with:
3434
name: installers
35-
path: tmp/
35+
path: out/
3636

3737
- name: Semantic release
3838
uses: glzr-io/actions/semantic-release@main
@@ -43,17 +43,17 @@ jobs:
4343
gh-assets: |
4444
[
4545
{
46-
"path": "tmp/installer-universal",
46+
"path": "out/installer-universal",
4747
"name": "glazewm-${nextRelease.gitTag}",
4848
"label": "${nextRelease.gitTag} Installer (recommended)"
4949
},
5050
{
51-
"path": "tmp/installer-x64",
51+
"path": "out/installer-x64",
5252
"name": "glazewm-x64-${nextRelease.gitTag}",
5353
"label": "${nextRelease.gitTag} Installer (standalone x64)"
5454
},
5555
{
56-
"path": "tmp/installer-arm64",
56+
"path": "out/installer-arm64",
5757
"name": "glazewm-arm64-${nextRelease.gitTag}",
5858
"label": "${nextRelease.gitTag} Installer (standalone arm64)"
5959
}

.gitignore

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2-
3-
# Build outputs
4-
target/
5-
tmp/
6-
7-
# Misc
8-
.DS_Store
9-
*.pem
10-
*.env
11-
.wix/
12-
13-
# IDE files
14-
.vs/
15-
.idea/
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# Build outputs
4+
target/
5+
out/
6+
7+
# Misc
8+
.DS_Store
9+
*.pem
10+
*.env
11+
.wix/
12+
13+
# IDE files
14+
.vs/
15+
.idea/

resources/wix/bundle.wxs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<!-- GlazeWM MSI for x64 architectures. -->
2626
<MsiPackage
2727
Id="Custom_GlazeWMPackageX64"
28-
SourceFile="tmp/installer-x64.msi"
28+
SourceFile="out/installer-x64.msi"
2929
InstallCondition="(VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 34404)"
3030
bal:DisplayInternalUICondition="1"
3131
Permanent="yes"
@@ -34,7 +34,7 @@
3434
<!-- GlazeWM MSI for arm64 architectures. -->
3535
<MsiPackage
3636
Id="Custom_GlazeWMPackageArm64"
37-
SourceFile="tmp/installer-arm64.msi"
37+
SourceFile="out/installer-arm64.msi"
3838
InstallCondition="NativeMachine = 43620"
3939
bal:DisplayInternalUICondition="1"
4040
Permanent="yes"
@@ -43,7 +43,7 @@
4343
<!-- Zebar MSI for x64 architectures. -->
4444
<MsiPackage
4545
Id="Custom_ZebarPackageX64"
46-
SourceFile="tmp/zebar-aaa-x64.msi"
46+
SourceFile="out/zebar-aaa-x64.msi"
4747
InstallCondition="(VersionNT64 AND NOT NativeMachine) OR (NativeMachine = 34404) AND (Custom_InstallZebar = 1)"
4848
bal:DisplayInternalUICondition="1"
4949
Permanent="yes"
@@ -52,7 +52,7 @@
5252
<!-- Zebar MSI for arm64 architectures. -->
5353
<MsiPackage
5454
Id="Custom_ZebarPackageArm64"
55-
SourceFile="tmp/zebar-aaa-arm64.msi"
55+
SourceFile="out/zebar-aaa-arm64.msi"
5656
InstallCondition="(NativeMachine = 43620) AND (Custom_InstallZebar = 1)"
5757
bal:DisplayInternalUICondition="1"
5858
Permanent="yes"

0 commit comments

Comments
 (0)