Fixes and improvements (#10)

Author: AttilaGombosER

.github/workflows/test_devcontainer.yml

@@ -12,6 +12,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install packaging tools
+        run: |
+          git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
+          sudo bash /tmp/packaging-tools/python/install.sh
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -22,13 +26,14 @@ jobs:
         with:
           container-platform: 'linux/arm/v7'
           container-config: 'arm32v7'
-          packaging-command: python3 setup.py sdist bdist_wheel
+          debian-dist-type: 'fpm-deb'
 
       - name: Assert packages have created
         run: |
           set -e
           ls -l dist
           ls dist/test_module-1.0.0-py3-none-any.whl
+          ls dist/python3-test-module_1.0.0_all.deb
 
   test-devcontainer-arm64v8:
     name: Test creating arm64v8 packages
@@ -37,6 +42,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install packaging tools
+        run: |
+          git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
+          sudo bash /tmp/packaging-tools/python/install.sh
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -47,13 +56,14 @@ jobs:
         with:
           container-platform: 'linux/arm64'
           container-config: 'arm64v8'
-          packaging-command: python3 setup.py sdist bdist_wheel
+          debian-dist-type: 'dh-virtualenv'
 
       - name: Assert packages have created
         run: |
           set -e
           ls -l dist
           ls dist/test_module-1.0.0-py3-none-any.whl
+          ls dist/test-module_1.0.0-1_all.deb
 
   test-devcontainer-amd64:
     name: Test creating amd64 packages
@@ -62,6 +72,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install packaging tools
+        run: |
+          git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
+          sudo bash /tmp/packaging-tools/python/install.sh
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -70,10 +84,13 @@ jobs:
       - name: Create packages
         uses: ./devcontainer
         with:
-          packaging-command: python3 setup.py sdist bdist_wheel
+          add-wheel-dist: 'false'
+          debian-dist-command: 'pack_python . --all'
 
       - name: Assert packages have created
         run: |
           set -e
           ls -l dist
           ls dist/test_module-1.0.0-py3-none-any.whl
+          ls dist/python3-test-module_1.0.0_all.deb
+          ls dist/test-module_1.0.0-1_all.deb

.github/workflows/test_main.yml

@@ -5,8 +5,8 @@ on:
     branches: [ "main" ]
 
 jobs:
-  test-main-fpm-deb:
-    name: Test creating packages (fpm-deb)
+  test-main-native-fpm-deb:
+    name: Test creating native packages (fpm-deb)
 
     runs-on: ubuntu-latest
 
@@ -31,8 +31,8 @@ jobs:
           ls dist/test_module-1.1.0-py3-none-any.whl
           ls dist/python3-test-module_1.1.0_all.deb
 
-  test-main-dh-virtualenv:
-    name: Test creating packages (dh-virtualenv)
+  test-main-dh-native-virtualenv:
+    name: Test creating native packages (dh-virtualenv)
 
     runs-on: ubuntu-latest
 
@@ -57,8 +57,8 @@ jobs:
           ls dist/test_module-1.1.0-py3-none-any.whl
           ls dist/test-module_1.1.0-1_all.deb
 
-  test-main-devcontainer:
-    name: Test creating packages (devcontainer)
+  test-main-devcontainer-fpm-deb:
+    name: Test creating packages in devcontainer (fpm-deb)
 
     runs-on: ubuntu-latest
 
@@ -76,11 +76,39 @@ jobs:
           use-devcontainer: 'true'
           container-platform: 'linux/arm64'
           container-config: 'arm64v8'
-          packaging-command: python3 setup.py sdist bdist_wheel
+          debian-dist-type: 'fpm-deb'
 
       - name: Assert packages have created
         run: |
           set -e
           ls -l dist
           ls dist/test-module-1.1.0.tar.gz
           ls dist/test_module-1.1.0-py3-none-any.whl
+          ls dist/python3-test-module_1.1.0_all.deb
+
+  test-main-devcontainer-dh-virtualenv:
+    name: Test creating packages in devcontainer (dh-virtualenv)
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up test environment
+        run: |
+          cp -a test/. .
+          rm -rf dist
+
+      - name: Create packages
+        uses: ./
+        with:
+          package-version: '1.1.0'
+          use-devcontainer: 'true'
+          debian-dist-type: 'dh-virtualenv'
+
+      - name: Assert packages have created
+        run: |
+          set -e
+          ls -l dist
+          ls dist/test-module-1.1.0.tar.gz
+          ls dist/test_module-1.1.0-py3-none-any.whl
+          ls dist/test-module_1.1.0-1_all.deb

.github/workflows/test_native.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install packaging tools
         run: |
           git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
-          echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
+          sudo bash /tmp/packaging-tools/python/install.sh
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -43,7 +43,7 @@ jobs:
       - name: Install packaging tools
         run: |
           git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
-          echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
+          sudo bash /tmp/packaging-tools/python/install.sh
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -72,7 +72,7 @@ jobs:
       - name: Install packaging tools
         run: |
           git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
-          echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
+          sudo bash /tmp/packaging-tools/python/install.sh
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -100,7 +100,7 @@ jobs:
       - name: Install packaging tools
         run: |
           git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
-          echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
+          sudo bash /tmp/packaging-tools/python/install.sh
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -110,11 +110,11 @@ jobs:
         uses: ./native
         with:
           debian-dist-type: 'dh-virtualenv'
-          debian-dist-command: 'dpkg-buildpackage -us -ui -uc -tc'
+          debian-dist-command: 'pack_python . -s dh-virtualenv -o dist'
 
       - name: Assert packages have created
         run: |
           set -e
           ls -l dist
           ls dist/test_module-1.0.0-py3-none-any.whl
-          ls dist/test-module_1.0.0_amd64.deb
+          ls dist/test-module_1.0.0-1_all.deb

README.md

@@ -34,18 +34,20 @@ Create Python distribution packages: source, wheel and Debian packages
 - `python-version`: Python version to use for the package creation (default: `3.9`)
 - `add-wheel-dist`: Add wheel distribution to the package creation (default: `true`)
 - `debian-dist-type`: Type of the Debian package to create: `fpm-deb`/`dh-virtualenv`/`none` (default: `none`)
-- `debian-dist-command`: Command to run for the Debian package creation (default: `pack_python . -s fpm-deb` or `pack_python . -s dh-virtualenv`)
+- `debian-dist-command`: Command to run for the Debian package creation
 
 ### Cross-platform package creation
 
+- `add-wheel-dist`: Add wheel distribution to the package creation (default: `true`)
+- `debian-dist-type`: Type of the Debian package to create: `fpm-deb`/`dh-virtualenv`/`none` (default: `none`)
+- `debian-dist-command`: Command to run for the Debian package creation
 - `docker-registry`: Docker registry to use (default: `docker.io`)
 - `docker-username`: Docker registry username
 - `docker-password`: Docker registry password
 - `container-platform`: Devcontainer platform (eg. `linux/amd64,linux/arm64,linux/arm/v7`, default: `linux/amd64`)
 - `container-config`: Devcontainer configuration selector `.devcontainer/<config>/devcontainer.json` (if not
   specified, it will use `.devcontainer/devcontainer.json`)
 - `packaging-folder`: Optional subfolder for running the packaging command (default: `.`)
-- `packaging-command`: Command to run in the devcontainer
 
 ## Outputs
 
@@ -106,5 +108,5 @@ jobs:
           docker-password: ${{ secrets.DOCKERHUB_TOKEN }}
           container-platform: 'linux/arm/v7'
           container-config: 'arm32v7'
-          packaging-command: 'pack_python . --all'
+          debian-dist-command: 'pack_python . --all'
 ```

action.yml

@@ -13,21 +13,17 @@ inputs:
     description: 'Build packages using devcontainer'
     required: false
     default: 'false'
-  add-source-dist:
-    description: 'Should create source distribution?'
-    required: false
-    default: 'true'
   pre-build-command:
     description: 'Command to execute before packaging'
     required: false
   post-build-command:
     description: 'Command to execute after packaging'
     required: false
-
-  python-version:
-    description: 'Python version'
+  add-source-dist:
+    description: 'Should create source distribution?'
     required: false
-    default: '3.9'
+    default: 'true'
+
   add-wheel-dist:
     description: 'Should create wheel distribution?'
     required: false
@@ -37,9 +33,14 @@ inputs:
     required: false
     default: 'none'
   debian-dist-command:
-    description: 'Debian build command'
+    description: 'Debian packaging custom command'
     required: false
 
+  python-version:
+    description: 'Python version'
+    required: false
+    default: '3.9'
+
   docker-registry:
     description: 'Docker registry'
     required: false
@@ -58,9 +59,10 @@ inputs:
     description: 'Devcontainer config selector (eg. architecture, OS, etc.)'
     required: false
     default: '.'
-  packaging-command:
-    description: 'Devcontainer run command'
+  packaging-folder:
+    description: 'Optional subfolder to run packaging command'
     required: false
+    default: '.'
 
 outputs:
   upload-name:
@@ -70,10 +72,13 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    - name: Symlink current Actions repo
-      working-directory: ${{ github.action_path }}
+    - name: Symlink current action repo
+      env:
+        action_path: ${{ github.action_path }}
       shell: bash
-      run: ln -fs $(realpath ../)  ${{ github.workspace }}/
+      run: |
+        ln -fs ${{ env.action_path }} .github/actions
+
     - name: Set up environment
       id: set-env
       shell: bash
@@ -95,7 +100,7 @@ runs:
       shell: bash
       run: |
         git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
-        echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
+        sudo bash /tmp/packaging-tools/python/install.sh
 
     - if: ${{ inputs.pre-build-command }}
       name: Run pre-build command
@@ -109,24 +114,30 @@ runs:
 
     - if: ${{ inputs.use-devcontainer != 'true' }}
       name: Build native packages
-      uses: ./native
+      uses: ./.github/actions/native
       with:
         python-version: ${{ inputs.python-version }}
-        add-source-dist: ${{ inputs.add-source-dist }}
         add-wheel-dist: ${{ inputs.add-wheel-dist }}
         debian-dist-type: ${{ inputs.debian-dist-type }}
         debian-dist-command: ${{ inputs.debian-dist-command }}
 
     - if: ${{ inputs.use-devcontainer == 'true' }}
       name: Build packages using a devcontainer
-      uses: ./devcontainer
+      uses: ./.github/actions/devcontainer
       with:
+        add-wheel-dist: ${{ inputs.add-wheel-dist }}
+        debian-dist-type: ${{ inputs.debian-dist-type }}
+        debian-dist-command: ${{ inputs.debian-dist-command }}
         docker-registry: ${{ inputs.docker-registry }}
         docker-username: ${{ inputs.docker-username }}
         docker-password: ${{ inputs.docker-password }}
         container-platform: ${{ inputs.container-platform }}
         container-config: ${{ inputs.container-config }}
-        packaging-command: ${{ inputs.packaging-command }}
+        packaging-folder: ${{ inputs.packaging-folder }}
+
+    - name: Unlink the action repository
+      run: rm -f .github/actions
+      shell: bash
 
     - if: ${{ inputs.post-build-command }}
       name: Run post-build command