Skip to content

Commit

Permalink
Update GitHub Workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacrlevin authored Nov 1, 2024
1 parent c32b498 commit be6a537
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 47 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/Azure_Blob_Deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ jobs:

steps:
- name: Azure login
uses: azure/login@v1.5.1
uses: azure/login@v2
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Download ${{ inputs.target }} Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ inputs.target }}_Signed
path: ./Signed/${{ inputs.target }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Choco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
name: Download Standalone Signed App Artifacts
with:
name: Standalone_Signed
path: .\StandaloneSigned

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ github.event_name == 'push' }}
name: Download Build Artifacts
with:
Expand All @@ -41,7 +41,7 @@ jobs:
echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
shell: powershell

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
name: Download Chocolatey Artifacts
with:
name: Chocolatey
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/Deploy_Desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ jobs:
fetch-depth: 0

- name: Use .NET Core SDK 8.0.x
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Get Version from Nerdbank.GitVersioning
uses: dotnet/[email protected].1
uses: dotnet/[email protected].2
with:
setCommonVars: true

Expand All @@ -77,20 +77,20 @@ jobs:
shell: pwsh

- name: Publish ${{ matrix.ChannelName }} Arifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ./src
name: PreBuild-${{ matrix.ChannelName }}

- name: Publish Build Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: Build
name: BuildArtifacts
if: ${{ success() && matrix.ChannelName == 'Standalone' }}

- name: Publish Chocolatey Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: .chocolatey
name: Chocolatey
Expand Down Expand Up @@ -118,18 +118,18 @@ jobs:
uses: microsoft/setup-msbuild@v1

- name: Use .NET Core SDK 8.0.x
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Download PreBuild
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: PreBuild-${{ matrix.ChannelName }}
path: ./src

- name: Download Build Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BuildArtifacts
path: ./BuildArtifacts
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
if: ${{ success() && matrix.ChannelName != 'Standalone' }}

- name: Publish ${{ matrix.ChannelName }} Arifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: .\${{ matrix.ChannelName }}
name: ${{ matrix.ChannelName }}
Expand Down Expand Up @@ -236,14 +236,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Azure Login
uses: azure/login@v1.5.1
uses: azure/login@v2
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Download Nightly Signed
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Nightly_Signed
path: "./NightlySigned"
Expand Down Expand Up @@ -282,19 +282,19 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download Standalone Signed App
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Standalone_Signed
path: ./StandaloneSigned

- name: Download Release Signed App
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Release_Signed
path: ./ReleaseSigned

- name: Download Build Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
if: ${{ github.event_name == 'push' }}
with:
name: BuildArtifacts
Expand All @@ -321,7 +321,7 @@ jobs:
shell: pwsh

- name: Create GitHub Release
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
uses: softprops/action-gh-release@v2
with:
tag_name: "Desktop-v${{ env.VERSION }}"
body: ${{ steps.changelog.outputs.changelog }}
Expand Down Expand Up @@ -356,7 +356,7 @@ jobs:
steps:

- name: Download Release Signed
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: Release_Signed
path: ./ReleaseSigned
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/Deploy_Web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ jobs:
fetch-depth: 0

- name: Use .NET Core SDK 8.0.x
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Nerdbank.GitVersioning
uses: dotnet/[email protected].1
uses: dotnet/[email protected].2
with:
setCommonVars: true

Expand All @@ -66,13 +66,13 @@ jobs:
shell: pwsh

- name: Publish PreBuild Arifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ./src
name: PreBuild

- name: Publish Files for Build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: Build
name: BuildArtifacts
Expand Down Expand Up @@ -110,18 +110,18 @@ jobs:
steps:

- name: Use .NET Core SDK 8.0.x
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Download PreBuild
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: PreBuild
path: ./src

- name: Download Build Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BuildArtifacts
path: ./BuildArtifacts
Expand All @@ -145,7 +145,7 @@ jobs:
shell: pwsh

- name: Publish ${{ matrix.ChannelName }} Arifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ./${{ matrix.ChannelName }}
name: ${{ matrix.ChannelName }}
Expand Down Expand Up @@ -184,13 +184,13 @@ jobs:

steps:
- name: Download PreBuild
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: PreBuild
path: ./src

- name: Download Build Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BuildArtifacts
path: ./BuildArtifacts
Expand Down Expand Up @@ -343,49 +343,49 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download Windows_x64_x86 Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Windows_x64_x86
path: ./Sign/Windows_x64_x86

- name: Download Windows_ARM Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Windows_ARM
path: ./Sign/Windows_ARM

- name: Download macOS Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: macOS
path: ./Sign/macOS

- name: Download Linux_ARM Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Linux_ARM
path: ./Sign/Linux_ARM

- name: Download Linux_ARM64 Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Linux_ARM64
path: ./Sign/Linux_ARM64

- name: Download Linux_Musl_x64 Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Linux_Musl_x64
path: ./Sign/Linux_Musl_x64

- name: Download Linux_Musl_ARM_x64 Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: Linux_Musl_ARM_x64
path: ./Sign/Linux_Musl_ARM_x64

- name: Download Build Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BuildArtifacts
path: "./BuildArtifacts"
Expand All @@ -396,7 +396,7 @@ jobs:
echo "VERSION=$version" >> $GITHUB_ENV
- name: Create GitHub Release
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
uses: softprops/action-gh-release@v2
with:
tag_name: "Web-v${{ env.VERSION }}"
body: ${{ steps.changelog.outputs.changelog }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/Sign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@ jobs:

steps:
- name: Download ${{ inputs.target }} Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ inputs.target }}
path: .\ToSign\${{ inputs.target }}

- name: Download Build Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: BuildArtifacts
path: .\BuildArtifacts

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.x

- name: Install Code Sign CLI tool
run: dotnet tool install --tool-path . sign --version 0.9.0-beta.23063.3

- name: Azure Login
uses: azure/login@v1.5.1
uses: azure/login@v2
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
Expand All @@ -70,7 +70,7 @@ jobs:
--verbosity Trace
- name: Publish Signed ${{ inputs.target }} Packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: .\ToSign\${{ inputs.target }}
name: '${{ inputs.target }}_Signed'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/WinGet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:

- name: Download Artifacts for Winget Publish
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
if: ${{ github.event_name == 'push' }}
with:
name: BuildArtifacts
Expand Down
1 change: 0 additions & 1 deletion src/PresenceLight.Razor/PresenceLight.Razor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\PresenceLight.Core\PresenceLight.Core.csproj" />
</ItemGroup>
Expand Down

0 comments on commit be6a537

Please sign in to comment.