Skip to content

Commit

Permalink
Merge pull request #55 from devlead/feature/cake_4_0_0
Browse files Browse the repository at this point in the history
GH54: Updated Cake Tool to version 4.0.0
  • Loading branch information
devlead authored Nov 18, 2023
2 parents ff1e747 + 13392a1 commit 5989e89
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "3.0.0",
"version": "4.0.0",
"commands": [
"dotnet-cake"
]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BuildGitHubAgentsUbuntuLatest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
sdk: ['6.0', '7.0']
sdk: ['6.0', '7.0', '8.0']
steps:
- if: github.ref == 'refs/heads/main'
name: Login to DockerHub
Expand All @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-dotnet@v3

- name: Run Cake script
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@master
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BuildGitHubAgentsUbuntuLatestFocal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
sdk: ['6.0', '7.0']
sdk: ['6.0', '7.0', '8.0']
steps:
- if: github.ref == 'refs/heads/main'
name: Login to DockerHub
Expand All @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-dotnet@v3

- name: Run Cake script
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@master
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BuildGitHubAgentsUbuntuLatestJammy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
sdk: ['6.0', '7.0']
sdk: ['6.0', '7.0', '8.0']
steps:
- if: github.ref == 'refs/heads/main'
name: Login to DockerHub
Expand All @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-dotnet@v3

- name: Run Cake script
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@master
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BuildGitHubAgentsUbuntuLatestMariner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
sdk: ['6.0', '7.0']
sdk: ['6.0', '7.0', '8.0']
steps:
- if: github.ref == 'refs/heads/main'
name: Login to DockerHub
Expand All @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-dotnet@v3

- name: Run Cake script
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@master
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BuildGitHubAgentsWin2019.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-dotnet@v3

- name: Run Cake script
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@master
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BuildGitHubAgentsWin2022.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-2022]
sdk: ['6.0', '7.0']
sdk: ['6.0', '7.0', '8.0']
steps:
- if: github.ref == 'refs/heads/main'
name: Login to DockerHub
Expand All @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-dotnet@v3

- name: Run Cake script
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@master
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/BuildSelfHostedAgent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
uses: actions/checkout@v3

- name: Run Cake script
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@master
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
10 changes: 5 additions & 5 deletions build/models/docker.cake
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ public record BaseImage(string Repo, string Tag, string CakePrefix)
public string CakeImage { get; } = $"cakebuild/cake:{CakePrefix}{Tag}";

public bool LinuxContainer { get; } = Tag switch {
"3.1" => true,
"6.0" => true,
"7.0" => true,
"8.0" => true,
string => (
Tag.StartsWith("3.1-")
|| Tag.StartsWith("6.0-")
Tag.StartsWith("6.0-")
|| Tag.StartsWith("7.0-")
|| Tag.StartsWith("8.0-")
)
&& (
!(
Expand All @@ -33,9 +33,9 @@ public record BaseImage(string Repo, string Tag, string CakePrefix)
};
public bool WindowsContainer { get; } = Tag switch {
string => (
Tag.StartsWith("3.1-")
|| Tag.StartsWith("6.0-")
Tag.StartsWith("6.0-")
|| Tag.StartsWith("7.0-")
|| Tag.StartsWith("8.0-")
)
&& (
(
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.402",
"version": "8.0.100",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down

0 comments on commit 5989e89

Please sign in to comment.