Merge branch 'main' of github.com:permasigner/permasigner

ydoow · Aug 31, 2022 · e0323d2 · e0323d2
2 parents 1c58f20 + 47568a1
commit e0323d2
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 93 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,36 +1,47 @@
-name: Build package and produce artifact
+name: Build package
 
 on:
-  push:
-    paths-ignore:
-      - 'README.md'
-      - 'book.json'
-      - '.gitignore'
-      - '.pep8'
-      - 'Dockerfile'
-      - 'Dockerfile.*'
-      - '.devcontainer/**'
-      - '.vscode/**'
-      - '.github/**'
-      - '!.github/workflows/build.yml'
-      - 'docs/**'
-    branches:
-      - "main"
-  pull_request:
-    paths-ignore:
-      - 'README.md'
-      - 'book.json'
-      - '.gitignore'
-      - '.pep8'
-      - 'Dockerfile'
-      - 'Dockerfile.*'
-      - '.devcontainer/**'
-      - '.vscode/**'
-      - '.github/**'
-      - '!.github/workflows/build.yml'
-      - 'docs/**'
-    branches:
-      - "main"
+  release:
+    types: [published]
+
+  workflow_dispatch:
+
+  workflow_run:
+    workflows: ["Test script"]
+    branches: [main]
+    types: 
+      - completed
+
+  #push:
+  #  paths-ignore:
+  #    - 'README.md'
+  #    - 'book.json'
+  #    - '.gitignore'
+  #    - '.pep8'
+  #    - 'Dockerfile'
+  #    - 'Dockerfile.*'
+  #    - '.devcontainer/**'
+  #    - '.vscode/**'
+  #    - '.github/**'
+  #    - '!.github/workflows/build.yml'
+  #    - 'docs/**'
+  #  branches:
+  #    - "main"
+  #pull_request:
+  #  paths-ignore:
+  #    - 'README.md'
+  #    - 'book.json'
+  #    - '.gitignore'
+  #    - '.pep8'
+  #    - 'Dockerfile'
+  #    - 'Dockerfile.*'
+  #    - '.devcontainer/**'
+  #    - '.vscode/**'
+  #    - '.github/**'
+  #    - '!.github/workflows/build.yml'
+  #    - 'docs/**'
+  #  branches:
+  #    - "main"
 
 jobs:
   build:
@@ -42,7 +53,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Install dependencies
         run: |
@@ -53,7 +64,16 @@ jobs:
         run: |
           make build
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
         with:
           name: Permasigner
           path: dist/*
+
+      - name: Publish to PyPi
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          twine upload dist/*
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,20 +1,26 @@
 name: Build and publish Docker image
 
 on:
-  push:
-    paths-ignore:
-      - 'README.md'
-      - 'book.json'
-      - '.gitignore'
-      - '.pep8'
-      - 'Dockerfile.development'
-      - '.devcontainer/**'
-      - '.vscode/**'
-      - '.github/**'
-      - '!.github/workflows/docker.yml'
-      - 'docs/**'
-    branches:
-      - "main"
+  #push:
+  #  paths-ignore:
+  #    - 'README.md'
+  #    - 'book.json'
+  #    - '.gitignore'
+  #    - '.pep8'
+  #    - 'Dockerfile.development'
+  #    - '.devcontainer/**'
+  #    - '.vscode/**'
+  #    - '.github/**'
+  #    - '!.github/workflows/docker.yml'
+  #    - 'docs/**'
+  #  branches:
+  #    - "main"
+
+  workflow_run:
+    workflows: ["Test script"]
+    branches: [main]
+    types: 
+      - completed
 
 jobs:
   docker:
@@ -39,6 +45,6 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64, linux/arm64
           push: true
           tags: itsnebulalol/permasigner:latest
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,16 +19,18 @@ on:
   workflow_dispatch:
 
 jobs:
-  autopep8:
+  lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - name: autopep8
+      - name: Lint with autopep8
         uses: peter-evans/autopep8@v1
         with:
           args: --recursive --in-place --global-config ".pep8" .
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Lint script with autopep8
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@v3
 
       # Setup which version of Python to use
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       # Install dependencies
       - name: Install dependencies
@@ -33,7 +33,8 @@ jobs:
         run: python3 main.py -u ${{ github.event.inputs.ipa }} -d
 
       # Upload test artifact
-      - uses: actions/upload-artifact@v3
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
         with:
           name: App.deb
           path: output/*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         # Run with all these versions of Python
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.8", "3.9", "3.10"]
 
     steps:
       # Checkout the latest code from the repo
@@ -67,7 +67,8 @@ jobs:
         run: python main.py -u https://github.com/Odyssey-Team/Taurine/releases/download/1.1.6/Taurine-1.1.6.ipa -d
 
       # Upload test artifact
-      - uses: actions/upload-artifact@v3
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
         with:
           name: TaurineTest-linux-Python${{ matrix.python-version }}.deb
           path: output/**
@@ -81,7 +82,7 @@ jobs:
         os: [macos-12]
 
         # Run with all these versions of Python
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9"]
 
     steps:
       - name: Set up Procursus
@@ -117,7 +118,8 @@ jobs:
         run: python3 -m permasigner -u https://github.com/Odyssey-Team/Taurine/releases/download/1.1.6/Taurine-1.1.6.ipa -o ${GITHUB_WORKSPACE}/output/ -d
 
       # Upload test artifact
-      - uses: actions/upload-artifact@v3
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
         with:
           name: TaurineTest-${{ matrix.os }}-Python${{ matrix.python-version }}.deb
           path: output/**
@@ -131,7 +133,7 @@ jobs:
         os: [windows-latest]
 
         # Run with all these versions of Python
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.8", "3.9", "3.10"]
 
     steps:
       # Checkout the latest code from the repo
@@ -159,7 +161,8 @@ jobs:
         run: python -m permasigner -u https://github.com/Odyssey-Team/Taurine/releases/download/1.1.6/Taurine-1.1.6.ipa -o ${GITHUB_WORKSPACE}/output/ -d
 
       # Upload test artifact
-      - uses: actions/upload-artifact@v3
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
         with:
           name: TaurineTest-${{ matrix.os }}-Python${{ matrix.python-version }}.deb
           path: \output\**