Merge branch 'master' into develop

sumeshi · Apr 4, 2022 · 6e4fbd4 · 6e4fbd4
2 parents c1a1083 + 21ecb2c
commit 6e4fbd4
Show file tree

Hide file tree

Showing 6 changed files with 860 additions and 35 deletions.
diff --git a/.github/workflows/build-binary.yaml b/.github/workflows/build-binary.yaml
@@ -1,8 +1,9 @@
 name: build-binary
 
 on:
-  release:
-    types: [published]
+  push:
+    tags:
+      - "v*.*.*"
 
 jobs:
   build-windows:
@@ -24,7 +25,7 @@ jobs:
           from pathlib import Path
           version = [l for l in Path('pyproject.toml').read_text().splitlines() if 'version' in l][0].split(' ')[-1].strip('\"')
           f = Path('src/ntfsdump/models/MetaData.py')
-          text = f.read_text().replace("version(name)", f"\'{version}\'")
+          text = f.read_text().replace("get_version(name)", f"\'{version}\'")
           f.write_text(text)
         shell: python
 
@@ -41,13 +42,12 @@ jobs:
       - name: build
         run: |
           pip install pyinstaller
-          pyinstaller --onefile -p . -p src -p src/ntfsdump -p ./.venv/Lib/ -p ./.venv/Lib/site-packages -n ntfsdump-windows ./.venv/Scripts/ntfsdump
+          pyinstaller --onefile -p . -p src -p src/ntfsdump -p ./.venv/Lib/ -p ./.venv/Lib/site-packages -n ntfsdump ./.venv/Scripts/ntfsdump
       
       - name: verify
-        run: dist/ntfsdump-windows.exe -h
+        run: dist/ntfsdump.exe -h
 
       - name: upload
-        uses: actions/upload-artifact@v3
+        uses: softprops/action-gh-release@v1
         with:
-          name: ntfsdump-windows
-          path: dist/ntfsdump-windows.exe
+          files: dist/ntfsdump.exe