Skip to content
Closed
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
42 changes: 21 additions & 21 deletions .github/workflows/build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
version: ${{ steps.meta.outputs.version }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set up repository tool SDK
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json

- name: Cache repository tool packages
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('global.json', 'tools/**/*.cs') }}
Expand All @@ -36,7 +36,7 @@ jobs:
run: dotnet run tools/wayscriber.cs --no-build -- ci install-dependencies package

- name: Set up Rust
uses: dtolnay/rust-toolchain@1.99.1
uses: dtolnay/rust-toolchain@1.120.0

- name: Install nfpm
run: dotnet run tools/wayscriber.cs --no-build -- ci install-nfpm
Expand Down Expand Up @@ -86,43 +86,43 @@ jobs:
run: dotnet run tools/wayscriber.cs --no-build -- package smoke-ubuntu --artifact-root dist

- name: Upload tarball
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-${{ steps.meta.outputs.version }}-tar
path: dist/wayscriber-v${{ steps.meta.outputs.version }}-linux-x86_64.tar.gz

- name: Upload configurator tarball
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-configurator-${{ steps.meta.outputs.version }}-tar
path: dist/wayscriber-configurator-v${{ steps.meta.outputs.version }}-linux-x86_64.tar.gz

- name: Upload deb
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-${{ steps.meta.outputs.version }}-deb
path: dist/wayscriber-amd64.deb

- name: Upload configurator deb
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-configurator-${{ steps.meta.outputs.version }}-deb
path: dist/wayscriber-configurator-amd64.deb

- name: Upload rpm
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-${{ steps.meta.outputs.version }}-rpm
path: dist/wayscriber-x86_64.rpm

- name: Upload configurator rpm
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-configurator-${{ steps.meta.outputs.version }}-rpm
path: dist/wayscriber-configurator-x86_64.rpm

- name: Upload manifests
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-${{ steps.meta.outputs.version }}-manifest
path: |
Expand All @@ -147,10 +147,10 @@ jobs:
PACKAGE_REPO_SSH_KNOWN_HOSTS: ${{ secrets.PACKAGE_REPO_SSH_KNOWN_HOSTS }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set up repository tool SDK
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json

Expand All @@ -161,7 +161,7 @@ jobs:
run: dotnet run tools/wayscriber.cs --no-build -- ci install-dependencies repositories

- name: Download packaged artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: dist
merge-multiple: true
Expand All @@ -180,7 +180,7 @@ jobs:
run: dotnet run tools/wayscriber.cs --no-build -- package build-repositories

- name: Upload repo bundle
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-${{ needs.package.outputs.version }}-repos
path: |
Expand All @@ -204,13 +204,13 @@ jobs:
contents: write
steps:
- name: Download packaged artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: dist
merge-multiple: true

- name: Publish GitHub release (auto notes)
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
files: dist/**/*
generate_release_notes: true
Expand All @@ -225,15 +225,15 @@ jobs:
AUR_SSH_PASSPHRASE: ${{ secrets.AUR_SSH_PASSPHRASE }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set up repository tool SDK
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json

- name: Cache repository tool packages
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('global.json', 'tools/**/*.cs') }}
Expand All @@ -248,7 +248,7 @@ jobs:
run: dotnet run tools/wayscriber.cs --no-build -- aur prepare-ssh

- name: Download packaged artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: dist
merge-multiple: true
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
timeout-minutes: 45
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set up repository tool SDK
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json

- name: Cache repository tool packages
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('global.json', 'tools/**/*.cs') }}
Expand All @@ -42,7 +42,7 @@ jobs:
run: dotnet run tools/wayscriber.cs --no-build -- ci prepare-gtk4-layer-shell --library-mode both

- name: Set up Rust
uses: dtolnay/rust-toolchain@1.99.1
uses: dtolnay/rust-toolchain@1.120.0
with:
components: clippy, rustfmt

Expand All @@ -68,7 +68,7 @@ jobs:

- name: Upload code-health report
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wayscriber-code-health
path: code-health-report.txt
Expand All @@ -80,15 +80,15 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set up repository tool SDK
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json

- name: Cache repository tool packages
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('global.json', 'tools/**/*.cs') }}
Expand All @@ -103,7 +103,7 @@ jobs:
run: dotnet run tools/wayscriber.cs --no-build -- ci prepare-gtk4-layer-shell --library-mode both

- name: Set up Rust
uses: dtolnay/rust-toolchain@1.99.1
uses: dtolnay/rust-toolchain@1.120.0
with:
components: clippy, rustfmt

Expand All @@ -122,10 +122,10 @@ jobs:
timeout-minutes: 20
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set up repository tool SDK
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v6
with:
global-json-file: global.json

Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
continue-on-error: ${{ matrix.checks == 'advisories' }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Check dependency policy
uses: EmbarkStudios/cargo-deny-action@v2
Expand Down
Loading