Merge branch 'master' into misc-cleanup

2 files changed, 8 insertions, 5 deletions

diff --git a/.github/workflows/iso-build.yaml b/.github/workflows/iso-build.yaml
index d08e68ff..acef87fb 100644
--- a/.github/workflows/iso-build.yaml
+++ b/.github/workflows/iso-build.yaml
@@ -3,6 +3,10 @@
 name: Build Arch ISO with ArchInstall Commit
 
 on:
+  push:
+    branches:
+      - master
+      - main # In case we adopt this convention in the future
   pull_request:
     paths-ignore:
     - '.github/**'
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 09bcba55..c24fc0d7 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -21,11 +21,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install setuptools wheel flit
     - name: Build and publish
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        FLIT_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        FLIT_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+        flit publish