Skip to content

Commit

Permalink
Merge pull request #37 from microsoft/user/lemccomb/retst2
Browse files Browse the repository at this point in the history
another release test
  • Loading branch information
lemccomb authored Sep 28, 2023
2 parents 90e96ad + 9ce86c3 commit 76f1c7e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ jobs:
# Official releases are created manually on GitHub.
# We include the release event as a no-op because release_assets requires it to run.
#
# Note: The Create Semver Tag failed but it wasn't because of a push event not completing. The command "git rev-parse --abbrev-ref HEAD --quiet" returned heads/main when it should have just returned main.
# Maybe this was because of a bad merge state in the working branch? Docker failure. Try again.
# Test: Will this complete if I force merge?
create_release:
name: Create Release
if: ${{ github.event_name == 'push' || github.event_name == 'release'}}
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
# Changelog

## [Unreleased](https://github.com/microsoft/CoseSignTool/tree/HEAD)
## [main](https://github.com/microsoft/CoseSignTool/tree/main) (2023-09-28)

[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.4...HEAD)
[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.5...main)

## [v0.3.1-pre.5](https://github.com/microsoft/CoseSignTool/tree/v0.3.1-pre.5) (2023-09-28)

[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.4...v0.3.1-pre.5)

**Merged pull requests:**

- release tests [\#36](https://github.com/microsoft/CoseSignTool/pull/36) ([lemccomb](https://github.com/lemccomb))
- Testing release job [\#35](https://github.com/microsoft/CoseSignTool/pull/35) ([lemccomb](https://github.com/lemccomb))
- Update dotnet.yml [\#34](https://github.com/microsoft/CoseSignTool/pull/34) ([lemccomb](https://github.com/lemccomb))
- restore missing checkout step [\#33](https://github.com/microsoft/CoseSignTool/pull/33) ([lemccomb](https://github.com/lemccomb))
Expand Down

0 comments on commit 76f1c7e

Please sign in to comment.