Skip to content

Commit 59321a0

Browse files
committed
feat!: build unicode targets only by default
1 parent e73d900 commit 59321a0

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ A Plugin repository is laid out like NSISDIR. The action checks this first and f
9494

9595
## Inputs
9696

97-
| Name | Default | Description |
98-
| ----------- | ---------------------- | ------------------------------------------------------------------------------------------------------------- |
99-
| `name` | | Plugin name, i.e. the DLL basename scripts call as `Name::Func`. |
100-
| `sources` | | `msvc` and `mingw` only: C/C++ source globs (`.c`, `.cpp`, `.cxx`, `.cc`, `.rc`). |
101-
| `project` | | `fpc` and `rust` only: path of the Pascal project file (`.dpr`, `.lpr`, `.pas`) or the plugin's `Cargo.toml`. |
102-
| `targets` | `x86-ansi,x86-unicode` | Any of `x86-ansi`, `x86-unicode`, `amd64-unicode`, `arm64-unicode`. |
103-
| `toolchain` | `msvc` | `msvc`, `fpc` or `rust` on a Windows runner, `mingw` on a Linux runner. |
104-
| `crt` | `static` | C/C++ only: `static` links the C runtime in; `none` builds without it, entry point `DllMain`. |
105-
| `release` | `true` | Attach the files to the release that triggered the run. |
97+
| Name | Default | Description |
98+
| ----------- | --------------------------- | ------------------------------------------------------------------------------------------------------------- |
99+
| `name` | | Plugin name, i.e. the DLL basename scripts call as `Name::Func`. |
100+
| `sources` | | `msvc` and `mingw` only: C/C++ source globs (`.c`, `.cpp`, `.cxx`, `.cc`, `.rc`). |
101+
| `project` | | `fpc` and `rust` only: path of the Pascal project file (`.dpr`, `.lpr`, `.pas`) or the plugin's `Cargo.toml`. |
102+
| `targets` | `x86-unicode,amd64-unicode` | Any of `x86-ansi`, `x86-unicode`, `amd64-unicode`, `arm64-unicode`. `x86-ansi` is opt-in. |
103+
| `toolchain` | `msvc` | `msvc`, `fpc` or `rust` on a Windows runner, `mingw` on a Linux runner. |
104+
| `crt` | `static` | C/C++ only: `static` links the C runtime in; `none` builds without it, entry point `DllMain`. |
105+
| `release` | `true` | Attach the files to the release that triggered the run. |
106106

107107
Each Toolchain takes exactly one of `sources` and `project`; the action fails before building if the other one is set.
108108
List inputs are comma or newline separated, so paths may contain spaces.

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ inputs:
1515
description: fpc and rust only; path of the Pascal project file (.dpr, .lpr, .pas) or the plugin's Cargo.toml
1616
targets:
1717
description: x86-ansi, x86-unicode, amd64-unicode, arm64-unicode
18-
default: x86-ansi,x86-unicode
18+
default: x86-unicode,amd64-unicode
1919
toolchain:
2020
description: msvc, fpc or rust (Windows runner), mingw (Linux runner)
2121
default: msvc

scripts/build_c.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def build_mingw(cfg, arch, unicode, dll, objdir):
251251
def resolve():
252252
toolchain, targets, crt = (
253253
env("TOOLCHAIN", "msvc"),
254-
split(env("TARGETS", "x86-ansi,x86-unicode")),
254+
split(env("TARGETS", "x86-unicode,amd64-unicode")),
255255
env("CRT", "static"),
256256
)
257257
check_inputs(toolchain, targets, crt)
@@ -267,7 +267,7 @@ def resolve():
267267
def build():
268268
toolchain, targets, crt = (
269269
env("TOOLCHAIN", "msvc"),
270-
split(env("TARGETS", "x86-ansi,x86-unicode")),
270+
split(env("TARGETS", "x86-unicode,amd64-unicode")),
271271
env("CRT", "static"),
272272
)
273273
check_inputs(toolchain, targets, crt)

scripts/build_pascal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def fpc_command(cfg, arch, unicode, dll, objdir):
111111

112112

113113
def resolve():
114-
check_inputs(split(env("TARGETS", "x86-ansi,x86-unicode")))
114+
check_inputs(split(env("TARGETS", "x86-unicode,amd64-unicode")))
115115
temp = Path(env("RUNNER_TEMP", tempfile.gettempdir()))
116116
set_output("version", PINNED_NSIS_VERSION)
117117
set_output("plugin-api", temp / f"nsis-plugin-api-{PINNED_NSIS_VERSION}")
@@ -121,7 +121,7 @@ def resolve():
121121

122122

123123
def build():
124-
targets = split(env("TARGETS", "x86-ansi,x86-unicode"))
124+
targets = split(env("TARGETS", "x86-unicode,amd64-unicode"))
125125
check_inputs(targets)
126126
name = env("NAME")
127127
if not name:

scripts/build_rust.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ def find_dll(messages, manifest):
8787

8888

8989
def resolve():
90-
check_inputs(split(env("TARGETS", "x86-ansi,x86-unicode")))
90+
check_inputs(split(env("TARGETS", "x86-unicode,amd64-unicode")))
9191
# No Plugin API to fetch, but the installer is still compiled with the pinned NSIS
9292
set_output("version", PINNED_NSIS_VERSION)
9393
set_output("output-dir", Path(env("OUTPUT_DIR", "out")).resolve())
9494

9595

9696
def build():
97-
targets = split(env("TARGETS", "x86-ansi,x86-unicode"))
97+
targets = split(env("TARGETS", "x86-unicode,amd64-unicode"))
9898
check_inputs(targets)
9999
name = env("NAME")
100100
if not name:

0 commit comments

Comments
 (0)