Skip to content

Commit

Permalink
Merge pull request #56 from microsoft/user/lemccomb/manualsemver3
Browse files Browse the repository at this point in the history
Cleanup comments, remove dead code
  • Loading branch information
lemccomb authored Nov 3, 2023
2 parents f3c2efc + e96d9fc commit 9a611cc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 34 deletions.
16 changes: 2 additions & 14 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ jobs:

# Create a changelog that includes all the PRs merged since the last release.
# If it's not a pull request, skip to the build job.
#
# TODO: Look into why the pull request page often loses track of the workflows once this completes.
create_changelog:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -134,15 +132,8 @@ jobs:
git checkout main
# Create a semantically versioned tag that increments the last release.
# - name: Create SemVer tag
# if: ${{ github.event_name == 'push' }}
# id: semver-tag # Output: ${{ steps.semver-tag.outputs.semver_tag }}
# uses: wakatime/[email protected]
# with:
# main_branch_name: "main"
# debug: true

# Create a semantically versioned tag that increments the last release with github commands.
# If the last release is a pre-release, increment the pre-release number, so v1.2.3-pre4 becomes v1.2.3-pre5.
# If the last release is an official release, create a new pre-release, so v1.2.3 becomes v1.2.3-pre1.
- name: Increment pre-release tag
if: ${{ github.event_name == 'push' }}
id: new-tag # Output: ${{ steps.new-tag.outputs.newtag }}
Expand Down Expand Up @@ -193,9 +184,6 @@ jobs:
echo "::set-output name=tag_name::${{ github.event.release.tag_name }}"
echo "Current release tag is ${{ github.event.release.tag_name }}."
fi
# previous version
#echo "::set-output name=tag_name::${{ steps.semver-tag.outputs.semver_tag }}"
#echo "Generated semver tag is ${{ steps.semver-tag.outputs.semver_tag }}."
#### RELEASE EVENTS ####

Expand Down
27 changes: 7 additions & 20 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,13 @@

## [Unreleased](https://github.com/microsoft/CoseSignTool/tree/HEAD)

[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.12...HEAD)
[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v1.1.0...HEAD)

**Merged pull requests:**

- Update dotnet.yml [\#55](https://github.com/microsoft/CoseSignTool/pull/55) ([lemccomb](https://github.com/lemccomb))
- Replace semver action with manual steps [\#54](https://github.com/microsoft/CoseSignTool/pull/54) ([lemccomb](https://github.com/lemccomb))

## [v0.3.1-pre.12](https://github.com/microsoft/CoseSignTool/tree/v0.3.1-pre.12) (2023-10-25)

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

**Merged pull requests:**

- DetachedSignatureFactory accepts pre-hashed content as payload [\#53](https://github.com/microsoft/CoseSignTool/pull/53) ([elantiguamsft](https://github.com/elantiguamsft))

## [v0.3.1-pre.11](https://github.com/microsoft/CoseSignTool/tree/v0.3.1-pre.11) (2023-10-11)

[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v1.1.0...v0.3.1-pre.11)

**Merged pull requests:**

- Add password support for certificate files [\#52](https://github.com/microsoft/CoseSignTool/pull/52) ([lemccomb](https://github.com/lemccomb))

## [v1.1.0](https://github.com/microsoft/CoseSignTool/tree/v1.1.0) (2023-10-10)
Expand All @@ -30,7 +17,7 @@

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

[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.2...v0.3.1-pre.10)
[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.9...v0.3.1-pre.10)

**Merged pull requests:**

Expand All @@ -40,13 +27,13 @@
- Port changes from ADO repo to GitHub repo [\#46](https://github.com/microsoft/CoseSignTool/pull/46) ([lemccomb](https://github.com/lemccomb))
- Re-enable CodeQL [\#45](https://github.com/microsoft/CoseSignTool/pull/45) ([lemccomb](https://github.com/lemccomb))

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

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

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

[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.8...v0.3.1-pre.9)
[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.8...v0.3.2)

**Merged pull requests:**

Expand Down

0 comments on commit 9a611cc

Please sign in to comment.