Skip to content

Commit

Permalink
Merge branch 'main' into ci/lab/test-2290/angle_bins
Browse files Browse the repository at this point in the history
  • Loading branch information
Perksey authored Oct 5, 2024
2 parents 03eb311 + 1c08ac5 commit 6b043a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/workflows/angle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
- build/nuke/Native/Core.cs
- build/nuke/Native/Angle.cs
- .github/workflows/angle.yml
workflow_dispatch:
jobs:
Build:
if: github.repository == 'dotnet/Silk.NET'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
# TODO build native mixins such as BuildLibSilkDroid
run: ./build.sh Pack --configuration Release --msbuild-properties ContinuousIntegrationBuild=true
- name: Upload Unsigned Artifacts to Actions
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v4
with:
name: unsigned_nupkgs
path: "build/output_packages/*nupkg"
Expand All @@ -90,14 +90,14 @@ jobs:
- uses: actions/[email protected]
with:
submodules: 'false'
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: unsigned_nupkgs
path: build/output_packages
- name: Sign Packages
run: .\build.cmd SignPackages --akv-certificate ${{ secrets.AKV_CERTIFICATE }} --akv-client-id ${{ secrets.AKV_CLIENT_ID }} --akv-client-secret ${{ secrets.AKV_CLIENT_SECRET }} --akv-tenant ${{ secrets.AKV_TENANT }} --akv-vault-url ${{ secrets.AKV_VAULT_URL }}
- name: Upload Signed Artifacts to Actions
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v4
with:
name: signed_nupkgs
path: "build/output_packages/*nupkg"
Expand Down

0 comments on commit 6b043a2

Please sign in to comment.