diff --git a/.github/actions/build-and-test/action.yml b/.github/actions/build-and-test/action.yml index f43e679..e0bdd9b 100644 --- a/.github/actions/build-and-test/action.yml +++ b/.github/actions/build-and-test/action.yml @@ -1,4 +1,4 @@ -name: Build and Test +name: Build and test description: Restores dependencies, builds, and runs tests. diff --git a/.github/actions/check-formatting/action.yml b/.github/actions/check-formatting/action.yml deleted file mode 100644 index 9ca60d1..0000000 --- a/.github/actions/check-formatting/action.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Check Formatting - -description: Restores dependencies and verifies formatting. - -runs: - using: "composite" - steps: - - uses: actions/setup-dotnet@v5 - - - name: Restore - shell: bash - run: dotnet restore - - - name: Check Formatting - shell: bash - run: dotnet format --verify-no-changes --no-restore diff --git a/.github/actions/create-release-artifacts/action.yml b/.github/actions/create-release-artifacts/action.yml index 6bb35d9..e990d75 100644 --- a/.github/actions/create-release-artifacts/action.yml +++ b/.github/actions/create-release-artifacts/action.yml @@ -1,17 +1,14 @@ -name: Publish +name: Create release artifacts description: Creates release-ready binaries and uploads them as artifacts. inputs: version: - description: 'Version number for the app' + description: 'Version number' default: '0.0.0' arch: description: 'Architecture for the build' default: 'x64' - artifact-name: - description: 'Name for the uploaded artifact bundle' - default: 'desktopclock' runs: using: "composite" @@ -34,7 +31,7 @@ runs: - uses: actions/upload-artifact@v7 with: - name: ${{ inputs.artifact-name }} + name: desktopclock-${{ inputs.arch }} if-no-files-found: error path: | publish/*.zip diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86bfa04..73b4289 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,18 @@ jobs: steps: - uses: actions/checkout@v5 - - uses: ./.github/actions/check-formatting + - uses: actions/setup-dotnet@v5 + + - name: Restore + shell: bash + run: dotnet restore + + - name: Check Formatting + shell: bash + run: dotnet format --verify-no-changes --no-restore build-test: - name: Build and Test + name: Build and test runs-on: windows-2025 steps: - uses: actions/checkout@v5 @@ -46,4 +54,3 @@ jobs: - uses: ./.github/actions/create-release-artifacts with: arch: ${{ matrix.arch }} - artifact-name: desktopclock-${{ matrix.arch }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 255e95a..bdcfd0d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,13 +4,14 @@ on: workflow_dispatch: inputs: version: - description: 'Version number for the app' + description: 'Version number' required: true default: '0.0.0' updateRelease: description: 'Update existing release' required: true - default: 'false' + type: boolean + default: false dryRun: description: 'Dry run' required: true @@ -21,16 +22,8 @@ permissions: contents: write jobs: - format: - name: Format - runs-on: windows-2025 - steps: - - uses: actions/checkout@v5 - - - uses: ./.github/actions/check-formatting - build-test: - name: Build and Test + name: Build and test runs-on: windows-2025 steps: - uses: actions/checkout@v5 @@ -51,12 +44,10 @@ jobs: with: version: ${{ inputs.version }} arch: ${{ matrix.arch }} - artifact-name: desktopclock-${{ matrix.arch }} deploy: name: Create GitHub release needs: - - format - build-test - package runs-on: windows-2025