Fix CI workflow default branches (#89)

* Fix CI workflow default branches * fix * Remove package GPG sign
OasisLMF · Feb 6, 2024 · 11351b4 · 11351b4
1 parent d642c08
commit 11351b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 31 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -168,24 +168,6 @@ jobs:
         name: bin_package
         path: ${{ github.workspace }}/
 
-    - name: Import GPG key
-      id: import_gpg
-      uses: crazy-max/ghaction-import-gpg@v5
-      with:
-        gpg_private_key: ${{ secrets.GPG_PYPI_SIGNING_KEY }}
-        passphrase: ${{ secrets.GPG_PYPI_SIGNING_PASS }}
-
-    - name: GPG sign Source package
-      working-directory: ${{ github.workspace }}
-      run: |
-        gpg --batch --no-tty --passphrase-fd 0 --detach-sign -a ${{ needs.package.outputs.src_filename }}
-
-    - name: GPG sign Wheel package
-      working-directory: ${{ github.workspace }}
-      run: |
-        gpg --batch --no-tty --passphrase-fd 0 --detach-sign -a ${{ needs.package.outputs.whl_filename }}
-
-
     # --- Create Release --- #
     - name: Push changes
       run: |
@@ -204,7 +186,6 @@ jobs:
         draft: false
         prerelease: ${{ env.PRE_RELEASE }}
 
-
     # --- Attach build assest --- #
     - name: Upload Source package
       id: upload-source-release-asset
@@ -234,19 +215,13 @@ jobs:
       run: pip install twine
 
     - name: PYPI - Source package
-      run: |
-        twine upload \
-        ${{ needs.package.outputs.src_filename }} \
-        ${{ needs.package.outputs.src_filename }}.asc
+      run: twine upload ${{ needs.package.outputs.src_filename }}
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
 
     - name: PYPI - Linux package
-      run: |
-        twine upload \
-        ${{ needs.package.outputs.whl_filename }} \
-        ${{ needs.package.outputs.whl_filename }}.asc
+      run: twine upload ${{ needs.package.outputs.whl_filename }}
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

diff --git a/.github/workflows/test-platform.yml b/.github/workflows/test-platform.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   platform_testing:
-    uses: OasisLMF/OasisPlatform/.github/workflows/test-python.yml@main
+    uses: OasisLMF/OasisPlatform/.github/workflows/test-python_api.yml@main
     secrets: inherit
     with:
       ods_branch: ${{ github.ref }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,10 +16,10 @@ jobs:
       oed_spec_branch: ${{ inputs.oed_spec_branch }}
 
   build-odm:
-    uses: OasisLMF/OasisDataManager/.github/workflows/build.yml@fix/release-0.1.0
+    uses: OasisLMF/OasisDataManager/.github/workflows/build.yml@main
     secrets: inherit
     with:
-      odm_branch: ${{ github.event_name != 'workflow_dispatch' && 'fix/release-0.1.0' ||  inputs.ods_branch }}
+      odm_branch: ${{ github.event_name != 'workflow_dispatch' && 'develop' ||  inputs.ods_branch }}
 
   test:
     name: Run Pytest
@@ -58,4 +58,4 @@ jobs:
       run: pip install -r tests/requirements.in
 
     - name: Run tests
-      run: pytest -v
+      run: pytest -v