Fixes (#9)

Author: AttilaGombosER

.github/workflows/test_devcontainer.yml

@@ -28,7 +28,6 @@ jobs:
         run: |
           set -e
           ls -l dist
-          ls dist/test-module-1.0.0.tar.gz
           ls dist/test_module-1.0.0-py3-none-any.whl
 
   test-devcontainer-arm64v8:
@@ -54,7 +53,6 @@ jobs:
         run: |
           set -e
           ls -l dist
-          ls dist/test-module-1.0.0.tar.gz
           ls dist/test_module-1.0.0-py3-none-any.whl
 
   test-devcontainer-amd64:
@@ -78,5 +76,4 @@ jobs:
         run: |
           set -e
           ls -l dist
-          ls dist/test-module-1.0.0.tar.gz
           ls dist/test_module-1.0.0-py3-none-any.whl

.github/workflows/test_native.yml

@@ -1,4 +1,4 @@
-name: Test platform independent Python packaging
+name: Test native Python packaging
 
 on:
   pull_request:
@@ -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
+          echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -26,7 +30,6 @@ jobs:
         run: |
           set -e
           ls -l dist
-          ls dist/test-module-1.0.0.tar.gz
           ls dist/test_module-1.0.0-py3-none-any.whl
           ls dist/python3-test-module_1.0.0_all.deb
 
@@ -37,6 +40,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install packaging tools
+        run: |
+          git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
+          echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -52,7 +59,6 @@ jobs:
         run: |
           set -e
           ls -l dist
-          ls dist/test-module-1.0.0.tar.gz
           ls dist/test_module-1.0.0-py3-none-any.whl
           ls dist/python-test-module_1.0.0_all.deb
 
@@ -63,6 +69,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install packaging tools
+        run: |
+          git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
+          echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -77,7 +87,6 @@ jobs:
         run: |
           set -e
           ls -l dist
-          ls dist/test-module-1.0.0.tar.gz
           ls dist/test_module-1.0.0-py3-none-any.whl
           ls dist/test-module_1.0.0-1_all.deb
 
@@ -88,6 +97,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install packaging tools
+        run: |
+          git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
+          echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
       - name: Set up test environment
         run: |
           cp -a test/. .
@@ -103,6 +116,5 @@ jobs:
         run: |
           set -e
           ls -l dist
-          ls dist/test-module-1.0.0.tar.gz
           ls dist/test_module-1.0.0-py3-none-any.whl
           ls dist/test-module_1.0.0_amd64.deb

README.md

@@ -27,11 +27,11 @@ Create Python distribution packages: source, wheel and Debian packages
 - `use-devcontainer`: Create packages using a devcontainer (default: `false`)
 - `pre-build-command`: Command to run before the package creation
 - `post-build-command`: Command to run after the package creation
+- `add-source-dist`: Add source distribution to the package creation (default: `true`)
 
 ### Platform independent or native package creation
 
 - `python-version`: Python version to use for the package creation (default: `3.9`)
-- `add-source-dist`: Add source distribution to the package creation (default: `true`)
 - `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`)

action.yml

@@ -13,6 +13,10 @@ 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
@@ -24,10 +28,6 @@ inputs:
     description: 'Python version'
     required: false
     default: '3.9'
-  add-source-dist:
-    description: 'Should create source distribution?'
-    required: false
-    default: 'true'
   add-wheel-dist:
     description: 'Should create wheel distribution?'
     required: false
@@ -71,11 +71,9 @@ runs:
   using: 'composite'
   steps:
     - name: Symlink current Actions repo
-      env:
-        GH_ACTION_REPO: ${{ github.action_repository }}
-        GH_ACTION_REF: ${{ github.action_ref }}
+      working-directory: ${{ github.action_path }}
       shell: bash
-      run: ln -s /home/runner/work/_actions/$GH_ACTION_REPO/$GH_ACTION_REF/  /home/runner/work/_actions/current
+      run: ln -fs $(realpath ../)  ${{ github.workspace }}/
     - name: Set up environment
       id: set-env
       shell: bash
@@ -93,11 +91,22 @@ runs:
       shell: bash
       run: sed -i "s/version='.*',/version='$VERSION',/" setup.py
 
+    - name: Install packaging tools
+      shell: bash
+      run: |
+        git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
+        echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
+
     - if: ${{ inputs.pre-build-command }}
       name: Run pre-build command
       shell: bash
       run: ${{ inputs.pre-build-command }}
 
+    - if: ${{ inputs.add-source-dist == 'true' }}
+      name: Create source distribution
+      shell: bash
+      run: python setup.py sdist
+
     - if: ${{ inputs.use-devcontainer != 'true' }}
       name: Build native packages
       uses: ./native

native/action.yml

@@ -9,10 +9,6 @@ inputs:
     description: 'Python version'
     required: false
     default: '3.9'
-  add-source-dist:
-    description: 'Should create source distribution?'
-    required: false
-    default: 'true'
   add-wheel-dist:
     description: 'Should create wheel distribution?'
     required: false
@@ -38,15 +34,6 @@ runs:
         python -m pip install --upgrade pip
         pip install .
         mkdir -p dist
-    - name: Install packaging tools
-      shell: bash
-      run: |
-        git clone https://github.com/EffectiveRange/packaging-tools.git /tmp/packaging-tools
-        echo "/tmp/packaging-tools/python" >> $GITHUB_PATH
-    - if: ${{ inputs.add-source-dist == 'true' }}
-      name: Create source distribution
-      shell: bash
-      run: python setup.py sdist
     - if: ${{ inputs.add-wheel-dist == 'true' }}
       name: Create wheel distribution
       shell: bash