Merge branch 'release/1.0.14'

charliemaiors · Jun 26, 2023 · de0ed58 · de0ed58
2 parents 92fbaf3 + eb05d27
commit de0ed58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -21,6 +21,16 @@ jobs:
       with:
         tag_name: ${{ github.ref }}
         release_name: Release ${{ github.ref }}
-        body_file: Changelog.md
+        body_path: Changelog.md
         draft: false
-        prerelease: false
+        prerelease: false
+    - name: "Upload assets"
+      uses: wangyoucao577/go-release-action@v1
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        goos: ${{ matrix.goos }}
+        goarch: ${{ matrix.goarch }}
+        goversion: "https://dl.google.com/go/go1.20.5.linux-amd64.tar.gz"
+        project_path: "."
+        binary_name: "sleep-on-lan"
+        extra_files: script/win-service-install.ps1 script/win-service-uninstall.ps1 README.md
diff --git a/.github/workflows/tag-create-release.yml b/.github/workflows/tag-create-release.yml
@@ -1,6 +1,6 @@
 on:
   release:
-    types: [published]
+    types: [created]
 
 name: Upload assets
 
@@ -20,13 +20,4 @@ jobs:
             goos: windows
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-      - uses: wangyoucao577/go-release-action@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          goos: ${{ matrix.goos }}
-          goarch: ${{ matrix.goarch }}
-          goversion: "https://dl.google.com/go/go1.20.5.linux-amd64.tar.gz"
-          project_path: "."
-          binary_name: "sleep-on-lan"
-          extra_files: script/win-service-install.ps1 script/win-service-uninstall.ps1 README.md
+        uses: actions/checkout@v2
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,3 @@
-# Release 1.0.12
+# Release 1.0.14
 
 * Actions test