Skip to content

Commit

Permalink
Merge branch 'develop' into develop-switch
Browse files Browse the repository at this point in the history
  • Loading branch information
ricaun authored Mar 28, 2024
2 parents 275499a + b081057 commit 2fa410b
Show file tree
Hide file tree
Showing 24 changed files with 900 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/alpha-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Evaluate whether your topic is going to be a valid issue:
- Have you checked the [FAQ](https://nuke.build/faq/)?
- Is your issue more of a question? Ask on [GitHub discussions](https://github.com/nuke-build/nuke/discussions), [Slack](https://nuke.build/slack), or [Discord](https://nuke.build/discord)!
- Have you checked existing/closed issues? Is your version behind?
- Have you read the relevant [changelog notes](https://github.com/nuke-build/nuke/blob/develop/CHANGELOG.md)?
- Have you verified it's not an external tool issue? Invoke the command manually!
- Don't file issues for tool wrappers. Send a pull request instead!
- Refrain from debating the governance or state of the project out of your own interests (see [consumer expectations](#consumer-expectations) & [sustainability contributions](#sustainability-contributions))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
lfs: true
fetch-depth: 2
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand All @@ -71,19 +71,19 @@ jobs:
OptionalInput: ${{ github.event.inputs.OptionalInput }}
RequiredInput: ${{ github.event.inputs.RequiredInput }}
- name: 'Publish: src'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: src
path: src
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: test-results
path: output/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: coverage-report.zip
Expand All @@ -102,7 +102,7 @@ jobs:
lfs: true
fetch-depth: 2
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand All @@ -114,19 +114,19 @@ jobs:
OptionalInput: ${{ github.event.inputs.OptionalInput }}
RequiredInput: ${{ github.event.inputs.RequiredInput }}
- name: 'Publish: src'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: src
path: src
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: test-results
path: output/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: coverage-report.zip
Expand All @@ -145,7 +145,7 @@ jobs:
lfs: true
fetch-depth: 2
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand All @@ -157,19 +157,19 @@ jobs:
OptionalInput: ${{ github.event.inputs.OptionalInput }}
RequiredInput: ${{ github.event.inputs.RequiredInput }}
- name: 'Publish: src'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: src
path: src
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: test-results
path: output/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: coverage-report.zip
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand All @@ -41,17 +41,17 @@ jobs:
ApiKey: ${{ secrets.API_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: 'Publish: src'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: src
path: src
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results
path: output/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-report.zip
path: output/coverage-report.zip
Expand All @@ -61,7 +61,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand All @@ -73,17 +73,17 @@ jobs:
ApiKey: ${{ secrets.API_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: 'Publish: src'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: src
path: src
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results
path: output/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-report.zip
path: output/coverage-report.zip
Expand All @@ -93,7 +93,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand All @@ -105,17 +105,17 @@ jobs:
ApiKey: ${{ secrets.API_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: 'Publish: src'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: src
path: src
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results
path: output/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-report.zip
path: output/coverage-report.zip
6 changes: 4 additions & 2 deletions source/Nuke.Common/CI/AzurePipelines/AzurePipelines.cs
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,16 @@ public void LogIssue(
.AddPairWhenValueNotNull("code", code));
}

public void SetVariable(string name, string value, bool? isSecret = null)
public void SetVariable(string name, string value, bool? isSecret = null, bool? isOutput = null, bool? isReadOnly = null)
{
WriteCommand(
"task.setvariable",
value,
dictionaryConfigurator: x => x
.AddPair("variable", name)
.AddPairWhenValueNotNull("issecret", isSecret));
.AddPairWhenValueNotNull("issecret", isSecret)
.AddPairWhenValueNotNull("isoutput", isOutput)
.AddPairWhenValueNotNull("isreadonly", isReadOnly));
}

private string GetText(AzurePipelinesIssueType type)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class GitHubActionsArtifactStep : GitHubActionsStep
public override void Write(CustomFileWriter writer)
{
writer.WriteLine("- name: " + $"Publish: {Name}".SingleQuote());
writer.WriteLine(" uses: actions/upload-artifact@v3");
writer.WriteLine(" uses: actions/upload-artifact@v4");

using (writer.Indent())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public override void Write(CustomFileWriter writer)
writer.WriteLine("- name: " + $"Cache: {IncludePatterns.JoinCommaSpace()}".SingleQuote());
using (writer.Indent())
{
writer.WriteLine("uses: actions/cache@v3");
writer.WriteLine("uses: actions/cache@v4");
writer.WriteLine("with:");
using (writer.Indent())
{
Expand Down
1 change: 1 addition & 0 deletions source/Nuke.Common/CI/GitHubActions/GitHubActionsImage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public enum GitHubActionsImage
[EnumValue("ubuntu-22.04")] Ubuntu2204,
[EnumValue("ubuntu-20.04")] Ubuntu2004,
[EnumValue("ubuntu-18.04")] Ubuntu1804,
[EnumValue("macos-14")] MacOs14,
[EnumValue("macos-12")] MacOs12,
[EnumValue("macos-11")] MacOs11,
[EnumValue("macos-10.15")] MacOs1015,
Expand Down
Loading

0 comments on commit 2fa410b

Please sign in to comment.