Merge pull request #26 from microsoft/user/lemccomb/official

Test publish
microsoft · Sep 26, 2023 · 6024164 · 6024164
2 parents fea9ef4 + 1316749
commit 6024164
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 41 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -9,11 +9,11 @@
 name: Build, Test, and Publish
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main" ]  # Trigger on pushes to the main branch.
     tags:
-      - '!*pre*'  # Don't trigger on prerelease tags.
+      - '!*pre*'          # Trigger on the creation of non-prerelease tags.
   pull_request:
-    branches: [ "*" ]
+    branches: [ "*" ]     # Trigger on all branches for pull requests.
 
 jobs:
   # If this is a pull request, create a changelog that includes all the PRs merged since the last release.
@@ -106,16 +106,18 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
-    - name: Checkout code again  # TODO: See if I can configure this step, or v3, to replace the Fetch and checkout step below.
+    - name: Checkout code  # TODO: See if I can configure this step, or v3, to replace the Fetch and checkout step below.
       uses: actions/checkout@v3
+      with:
+        ref: main
 
-    # Checkout the main branch so we can see the correct tag set.
-    - name: Fetch and checkout main
-      run: |
-        git config --local user.email "action@github.com"
-        git config --local user.name "GitHub Action"
-        git fetch
-        git checkout main
+    # # Checkout the main branch so we can see the correct tag set.
+    # - name: Fetch and checkout main
+    #   run: |
+    #     git config --local user.email "action@github.com"
+    #     git config --local user.name "GitHub Action"
+    #     git fetch
+    #     git checkout main
 
     # Create a semantically versioned tag that increments the last release.
     - name: Create SemVer tag
@@ -212,10 +214,4 @@ jobs:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: ./published/CoseSignTool-*.zip
         file_glob: true
-        overwrite: true
-
-
-
-
-
-
+        overwrite: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,37 +1,17 @@
 # Changelog
 
-## [v0.0.2-pre.1](https://github.com/microsoft/CoseSignTool/tree/v0.0.2-pre.1) (2023-09-26)
+## [Unreleased](https://github.com/microsoft/CoseSignTool/tree/HEAD)
 
-[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.0.2...v0.0.2-pre.1)
+[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1...HEAD)
 
 **Merged pull requests:**
 
+- Enable official releases [\#25](https://github.com/microsoft/CoseSignTool/pull/25) ([lemccomb](https://github.com/lemccomb))
 - checkout from main instead of current branch to get semver [\#24](https://github.com/microsoft/CoseSignTool/pull/24) ([lemccomb](https://github.com/lemccomb))
-
-## [v0.0.2](https://github.com/microsoft/CoseSignTool/tree/v0.0.2) (2023-09-26)
-
-[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.0.1...v0.0.2)
-
-**Merged pull requests:**
-
 - Update dotnet.yml with missing pipe [\#23](https://github.com/microsoft/CoseSignTool/pull/23) ([lemccomb](https://github.com/lemccomb))
 - Test semver creation via git commands [\#22](https://github.com/microsoft/CoseSignTool/pull/22) ([lemccomb](https://github.com/lemccomb))
-
-## [v0.0.1](https://github.com/microsoft/CoseSignTool/tree/v0.0.1) (2023-09-25)
-
-[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.0.0-pre.1...v0.0.1)
-
-**Merged pull requests:**
-
 - Attempt to get semver step working again [\#21](https://github.com/microsoft/CoseSignTool/pull/21) ([lemccomb](https://github.com/lemccomb))
 - move create\_changelog to before build [\#20](https://github.com/microsoft/CoseSignTool/pull/20) ([lemccomb](https://github.com/lemccomb))
-
-## [v0.0.0-pre.1](https://github.com/microsoft/CoseSignTool/tree/v0.0.0-pre.1) (2023-09-08)
-
-[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1...v0.0.0-pre.1)
-
-**Merged pull requests:**
-
 - Try release [\#19](https://github.com/microsoft/CoseSignTool/pull/19) ([lemccomb](https://github.com/lemccomb))
 - try release [\#18](https://github.com/microsoft/CoseSignTool/pull/18) ([lemccomb](https://github.com/lemccomb))
 - Add license text to code files [\#17](https://github.com/microsoft/CoseSignTool/pull/17) ([lemccomb](https://github.com/lemccomb))