Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
# ghcr.io happens once, in the build job below, which does pass --push.
- name: Build container image (no push)
if: matrix.rid == 'linux-x64'
run: ./build.sh publishcontainers -s true
run: ./build.sh publishcontainers -s
shell: bash

- name: Report container image size
Expand Down Expand Up @@ -93,9 +93,9 @@ jobs:
env:
MISE_JOBS: "1" # dotnet versions share one DOTNET_ROOT; installing them in parallel races

- run: ./build.sh build -s true
- run: ./build.sh build -s
name: Build
- run: ./build.sh generatepackages -s true
- run: ./build.sh generatepackages -s
name: Generate local nuget packages

- name: Download per-RID AOT packages
Expand All @@ -106,9 +106,9 @@ jobs:
path: build/output
merge-multiple: true

- run: ./build.sh validatepackages -s true
- run: ./build.sh validatepackages -s
name: "validate *.npkg files that were created"
- run: ./build.sh generateapichanges -s true
- run: ./build.sh generateapichanges -s
name: "Inspect public API changes"

# the tools are restored by the steps above
Expand All @@ -128,15 +128,15 @@ jobs:
# publishContainers/containerImageTags in Targets.fs for how that split is decided.
- name: Log in to ghcr.io
if: github.event_name == 'push' || github.event_name == 'release'
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4.8.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Publish container image
if: github.event_name == 'push' || github.event_name == 'release'
run: ./build.sh publishcontainers -s true --push
run: ./build.sh publishcontainers -s --push

# Trusted publishing: nuget.org trusts this repository's ci.yml (a policy owned by the nullean
# organization), so there is no long-lived API key to expire. The key it returns lasts an hour, so the
Expand Down Expand Up @@ -179,6 +179,6 @@ jobs:
gh release edit "$TAG" --repo "$GITHUB_REPOSITORY" --notes-file "$RUNNER_TEMP/notes.md"

zizmor:
uses: nullean/.github/.github/workflows/zizmor.yml@83ef343759c443afe1964e9c33327527f8677b05 # v1.3.0
uses: nullean/.github/.github/workflows/zizmor.yml@d850ce6eee9efa9f81b410d15fcd480409518d19 # v1.5.0
permissions:
contents: read
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions: {}

jobs:
draft:
uses: nullean/.github/.github/workflows/release-drafter.yml@83ef343759c443afe1964e9c33327527f8677b05 # v1.3.0
uses: nullean/.github/.github/workflows/release-drafter.yml@d850ce6eee9efa9f81b410d15fcd480409518d19 # v1.5.0
permissions:
contents: write
pull-requests: read
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ one release label. This repository's own releases do not run the tool: release-d
CI's `aot-pack` job runs it on each RID it builds.
- Build targets are Make.Fs `target { }` blocks in `build/scripts/Program.fs` whose commands are Proc.Fs `sh $"…"`
lines; values come from `text` inside `shell { }` (`Versions.fs`). Do not call the C# `ProcNet` API from the build.
CI calls targets by name (`./build.sh generatepackages -s true`): keep multi-word case names as one word.
CI calls targets by name (`./build.sh generatepackages -s`): keep multi-word case names as one word.
10 changes: 6 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

<!-- the tool -->
<ItemGroup>
<PackageVersion Include="MinVer" Version="6.0.0" />
<PackageVersion Include="Nullean.Argh" Version="0.18.0" />
<PackageVersion Include="NuGet.Versioning" Version="6.13.1" />
<PackageVersion Include="MinVer" Version="8.0.0" />
<PackageVersion Include="Nullean.Argh" Version="0.28.0" />
<!-- NuGet.Versioning 8 targets only net10.0 and net472: net8.0 would fall back to the .NET Framework build (NU1701) -->
<PackageVersion Include="NuGet.Versioning" Version="8.0.0" Condition="'$(TargetFramework)' != 'net8.0'" />
<PackageVersion Include="NuGet.Versioning" Version="7.9.0" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="Octokit" Version="14.0.0" />
</ItemGroup>

Expand All @@ -16,6 +18,6 @@
<!-- under CPM the F# SDK adds no implicit FSharp.Core; Nullean.Make.Fs needs 11.0.100 or later -->
<PackageVersion Include="FSharp.Core" Version="11.0.101" />
<!-- brings Proc and Proc.Fs -->
<PackageVersion Include="Nullean.Make.Fs" Version="0.25.0" />
<PackageVersion Include="Nullean.Make.Fs" Version="0.28.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions build/scripts/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ let main argv =
|> Seq.head
|> fun p -> Paths.RootRelative p.FullName
let version = Versions.informational.Value
sh $"dotnet nupkg-validator {package} -v {version} -a {Paths.ToolName} -k 96c599bbe3e70f5d" }
sh $"dotnet nupkg-validator validate {package} -v {version} -a {Paths.ToolName} -k 96c599bbe3e70f5d" }
| Generateapichanges -> target [] {
let version = Versions.current.Value
let tool = Paths.ToolName
Expand All @@ -92,7 +92,7 @@ let main argv =
// so NuGetAssemblyProvider would find 0 assemblies there. The portable, signed managed build
// lives in "release-notes.any" instead.
// The provider specs are quoted: an unquoted | would pipe.
sh $"dotnet assembly-differ 'previous-nuget|{tool}.any|{version}|net10.0' 'directory|src/{tool}/bin/Release/net10.0' --target {tool} -f github-comment --output {output}" }
sh $"dotnet assembly-differ diff 'previous-nuget|{tool}.any|{version}|net10.0' 'directory|src/{tool}/bin/Release/net10.0' --target {tool} -f github-comment --output {output}" }
// Publishes the CLI's native-AOT build as a container image via the .NET SDK's own container
// support (`dotnet publish -t:PublishContainer`), the same mechanism used for curb — see
// https://github.com/nullean/curb/pull/72. linux-x64 only for now; a second RID becomes a second
Expand Down
16 changes: 8 additions & 8 deletions dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
"isRoot": true,
"tools": {
"minver-cli": {
"version": "6.0.0",
"version": "8.0.0",
"commands": [
"minver"
],
"rollForward": false
},
"nupkg-validator": {
"version": "0.10.0",
"assembly-differ": {
"version": "0.18.2",
"commands": [
"nupkg-validator"
"assembly-differ"
],
"rollForward": false
},
"assembly-differ": {
"version": "0.16.0",
"nupkg-validator": {
"version": "0.11.5",
"commands": [
"assembly-differ"
"nupkg-validator"
],
"rollForward": false
},
"curb-cli": {
"version": "0.14.0",
"version": "0.14.1",
"commands": [
"curb"
],
Expand Down
Loading