Merge pull request #360 from macadmins/development

Prepare official 1.1.7 release
macadmins · Jun 3, 2022 · b77495c · b77495c
2 parents a19b1e6 + 8e27ed4
commit b77495c
Show file tree

Hide file tree

Showing 44 changed files with 1,889 additions and 338 deletions.
diff --git a/.github/workflows/build_nudge_prerelease.yml b/.github/workflows/build_nudge_prerelease.yml
@@ -10,12 +10,14 @@ on:
     paths-ignore:
     - 'assets/**'
     - 'Example Assets/**'
+    - '**/CHANGELOG.md'
     - '**/README.md'
 
 jobs:
   build:
     runs-on: macos-11
 
+    steps:
     - name: Checkout nudge repo
       uses: actions/checkout@v2
       with:
@@ -43,12 +45,21 @@ jobs:
       id: get_env_var
       run: |
          echo "NUDGE_VERSION=$(/bin/cat ./build_info.txt)" >> $GITHUB_ENV
+         echo "NUDGE_MAIN_VERSION=$(/bin/cat ./build_info_main.txt)" >> $GITHUB_ENV
+
+    - name: Get Changelog Entry
+      id: changelog_reader
+      uses: mindsers/changelog-reader-action@e1a36842bddbd512340f882735802de843998e1f # v2.0.0
+      with:
+        validation_depth: 100
+        version: ${{ env.NUDGE_MAIN_VERSION }}
 
     - name: Generate changelog
       id: changelog
-      uses: metcalfc/changelog-generator@e5306b306fa2e34f05258789e0e5c526c1bd4352 # v1.0.0
+      uses: metcalfc/changelog-generator@6a73d830c3191442cb22efe153073b4a36e0c3ea # v3.0.0
       with:
         myToken: ${{ secrets.GITHUB_TOKEN }}
+        reverse: 'true'
 
     - name: Create Pre-Release
       id: create_pre_release
@@ -69,6 +80,9 @@ jobs:
             This is a basic launch agent that opens Nudge twice an hour, every 30 minutes.
             If you would like to reduce the amount of times Nudge launches per day, it is recommended to create your own LaunchAgent.
 
+            # Changelog
+            ${{ steps.changelog_reader.outputs.changes }}
+
             # Changes
             ${{ steps.changelog.outputs.changelog }}
         draft: false
@@ -101,7 +115,17 @@ jobs:
       with:
         upload_url: ${{ steps.create_pre_release.outputs.upload_url }}
         asset_path: ./outputs/Nudge_Logger-1.0.1.pkg
-        asset_name: Nudge_LaunchLogger-1.0.1.pkg
+        asset_name: Nudge_Logger-1.0.1.pkg
+        asset_content_type: application/x-newton-compatible-pkg
+
+    - name: Upload Signed Package Pre-Release Asset (Suite)
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_pre_release.outputs.upload_url }}
+        asset_path: ./outputs/Nudge_Suite-${{env.NUDGE_VERSION}}.pkg
+        asset_name: Nudge_Suite-${{env.NUDGE_VERSION}}.pkg
         asset_content_type: application/x-newton-compatible-pkg
 
     - name: Upload packages

diff --git a/.github/workflows/build_nudge_prerelease_manual.yml b/.github/workflows/build_nudge_prerelease_manual.yml
@@ -37,12 +37,21 @@ jobs:
       id: get_env_var
       run: |
          echo "NUDGE_VERSION=$(/bin/cat ./build_info.txt)" >> $GITHUB_ENV
+         echo "NUDGE_MAIN_VERSION=$(/bin/cat ./build_info_main.txt)" >> $GITHUB_ENV
+
+    - name: Get Changelog Entry
+      id: changelog_reader
+      uses: mindsers/changelog-reader-action@e1a36842bddbd512340f882735802de843998e1f # v2.0.0
+      with:
+        validation_depth: 100
+        version: ${{ env.NUDGE_MAIN_VERSION }}
 
     - name: Generate changelog
       id: changelog
-      uses: metcalfc/changelog-generator@e5306b306fa2e34f05258789e0e5c526c1bd4352 # v1.0.0
+      uses: metcalfc/changelog-generator@6a73d830c3191442cb22efe153073b4a36e0c3ea # v3.0.0
       with:
         myToken: ${{ secrets.GITHUB_TOKEN }}
+        reverse: 'true'
 
     - name: Create Pre-Release
       id: create_pre_release
@@ -63,6 +72,9 @@ jobs:
             This is a basic launch agent that opens Nudge twice an hour, every 30 minutes.
             If you would like to reduce the amount of times Nudge launches per day, it is recommended to create your own LaunchAgent.
 
+            # Changelog
+            ${{ steps.changelog_reader.outputs.changes }}
+
             # Changes
             ${{ steps.changelog.outputs.changelog }}
         draft: false
@@ -95,7 +107,17 @@ jobs:
       with:
         upload_url: ${{ steps.create_pre_release.outputs.upload_url }}
         asset_path: ./outputs/Nudge_Logger-1.0.1.pkg
-        asset_name: Nudge_LaunchLogger-1.0.1.pkg
+        asset_name: Nudge_Logger-1.0.1.pkg
+        asset_content_type: application/x-newton-compatible-pkg
+
+    - name: Upload Signed Package Pre-Release Asset (Suite)
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_pre_release.outputs.upload_url }}
+        asset_path: ./outputs/Nudge_Suite-${{env.NUDGE_VERSION}}.pkg
+        asset_name: Nudge_Suite-${{env.NUDGE_VERSION}}.pkg
         asset_content_type: application/x-newton-compatible-pkg
 
     - name: Upload packages

diff --git a/.github/workflows/build_nudge_release.yml b/.github/workflows/build_nudge_release.yml
@@ -1,4 +1,4 @@
-name: Build signed Nudge and upload signed package
+name: Bbuild signed Nudge and upload signed package
 
 env:
   NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD }}
@@ -10,6 +10,7 @@ on:
     paths-ignore:
     - 'assets/**'
     - 'Example Assets/**'
+    - '**/CHANGELOG.md'
     - '**/README.md'
 
 jobs:
@@ -44,12 +45,21 @@ jobs:
       id: get_env_var
       run: |
          echo "NUDGE_VERSION=$(/bin/cat ./build_info.txt)" >> $GITHUB_ENV
+         echo "NUDGE_MAIN_VERSION=$(/bin/cat ./build_info_main.txt)" >> $GITHUB_ENV
+
+    - name: Get Changelog Entry
+      id: changelog_reader
+      uses: mindsers/changelog-reader-action@e1a36842bddbd512340f882735802de843998e1f # v2.0.0
+      with:
+        validation_depth: 100
+        version: ${{ env.NUDGE_MAIN_VERSION }}
 
     - name: Generate changelog
       id: changelog
-      uses: metcalfc/changelog-generator@e5306b306fa2e34f05258789e0e5c526c1bd4352 # v1.0.0
+      uses: metcalfc/changelog-generator@6a73d830c3191442cb22efe153073b4a36e0c3ea # v3.0.0
       with:
         myToken: ${{ secrets.GITHUB_TOKEN }}
+        reverse: 'true'
 
     - name: Create Release
       id: create_release
@@ -70,6 +80,9 @@ jobs:
             This is a basic launch agent that opens Nudge twice an hour, every 30 minutes.
             If you would like to reduce the amount of times Nudge launches per day, it is recommended to create your own LaunchAgent.
 
+            # Changelog
+            ${{ steps.changelog_reader.outputs.changes }}
+
             # Changes
             ${{ steps.changelog.outputs.changelog }}
         draft: false
@@ -105,6 +118,16 @@ jobs:
         asset_name: Nudge_Logger-1.0.1.pkg
         asset_content_type: application/x-newton-compatible-pkg
 
+    - name: Upload Signed Package Release Asset (Suite)
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_pre_release.outputs.upload_url }}
+        asset_path: ./outputs/Nudge_Suite-${{env.NUDGE_VERSION}}.pkg
+        asset_name: Nudge_Suite-${{env.NUDGE_VERSION}}.pkg
+        asset_content_type: application/x-newton-compatible-pkg
+
     - name: Upload packages
       uses: actions/upload-artifact@v1
       with:

diff --git a/.github/workflows/build_nudge_release_manual.yml b/.github/workflows/build_nudge_release_manual.yml
@@ -37,12 +37,21 @@ jobs:
       id: get_env_var
       run: |
          echo "NUDGE_VERSION=$(/bin/cat ./build_info.txt)" >> $GITHUB_ENV
+         echo "NUDGE_MAIN_VERSION=$(/bin/cat ./build_info_main.txt)" >> $GITHUB_ENV
+
+    - name: Get Changelog Entry
+      id: changelog_reader
+      uses: mindsers/changelog-reader-action@e1a36842bddbd512340f882735802de843998e1f # v2.0.0
+      with:
+        validation_depth: 100
+        version: ${{ env.NUDGE_MAIN_VERSION }}
 
     - name: Generate changelog
       id: changelog
-      uses: metcalfc/changelog-generator@e5306b306fa2e34f05258789e0e5c526c1bd4352 # v1.0.0
+      uses: metcalfc/changelog-generator@6a73d830c3191442cb22efe153073b4a36e0c3ea # v3.0.0
       with:
         myToken: ${{ secrets.GITHUB_TOKEN }}
+        reverse: 'true'
 
     - name: Create Release
       id: create_release
@@ -63,6 +72,9 @@ jobs:
             This is a basic launch agent that opens Nudge twice an hour, every 30 minutes.
             If you would like to reduce the amount of times Nudge launches per day, it is recommended to create your own LaunchAgent.
 
+            # Changelog
+            ${{ steps.changelog_reader.outputs.changes }}
+
             # Changes
             ${{ steps.changelog.outputs.changelog }}
         draft: false
@@ -98,6 +110,16 @@ jobs:
         asset_name: Nudge_Logger-1.0.1.pkg
         asset_content_type: application/x-newton-compatible-pkg
 
+    - name: Upload Signed Package Release Asset (Suite)
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_pre_release.outputs.upload_url }}
+        asset_path: ./outputs/Nudge_Suite-${{env.NUDGE_VERSION}}.pkg
+        asset_name: Nudge_Suite-${{env.NUDGE_VERSION}}.pkg
+        asset_content_type: application/x-newton-compatible-pkg
+
     - name: Upload packages
       uses: actions/upload-artifact@v1
       with: