Merge branch 'main' into development

unipoll · Oct 2, 2023 · 839dfdf · 839dfdf
2 parents 210452d + b0334fb
commit 839dfdf
Show file tree

Hide file tree

Showing 6 changed files with 672 additions and 465 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -2,60 +2,11 @@ name: Release Package
 
 on:
   workflow_dispatch:
-
-  # pull_request:
-  #   branches:
-  #     - "main"
 
 jobs:
-  # test:
-  #   name: Test with tox
-  #   runs-on: arc-runner-k8s
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       python-version: ['3.11'] 
-  #       node-version: [18.x] 
-  #       mongodb-version: ['6.0'] 
-  #   steps:
-  #     - name: Force Install GIT latest
-  #       run: |
-  #         sudo apt-get update
-  #         sudo apt-get install -y software-properties-common
-  #         sudo add-apt-repository -y ppa:git-core/ppa
-  #         sudo apt-get update
-  #         sudo apt-get install -y git
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 0
-  #         fetch-tags: true
-  #     - uses: actions/setup-node@v3
-  #       with:
-  #         node-version: ${{ matrix.node-version }}
-  #     - name: Start MongoDB
-  #       uses: supercharge/mongodb-github-action@1.10.0
-  #       with:
-  #         mongodb-version: ${{ matrix.mongodb-version }}
-  #     - name: Set up Python ${{matrix.python-version}}
-  #       uses: actions/setup-python@v4
-  #       with:
-  #         python-version: ${{matrix.python-version}}
-  #     - name: Install dependencies
-  #       run: |
-  #         python -m pip install --upgrade pip
-  #         pip install tox tox-gh-actions --root-user-action=ignore
-  #     - name: Test with tox
-  #       run: |
-  #         tox run
-  #     - name: Coveralls
-  #       uses: coverallsapp/github-action@master
-  #       with:
-  #         github-token: ${{ secrets.GITHUB_TOKEN }}
-  #         path-to-lcov: coverage.lcov
   release:
     name: Release Package to GitHub
     runs-on: arc-runner-k8s
-    # needs: test
     concurrency: release
     permissions:
       id-token: write
@@ -75,13 +26,11 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-        ref: ${{ github.head_ref || github.ref_name }}
     - id: release
       name: Python Semantic Release
       uses: python-semantic-release/python-semantic-release@master
       with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          force: "patch"
     - name: Publish package to GitHub Release
       uses: python-semantic-release/upload-to-gh-release@main
       if: steps.release.outputs.released == 'true'
@@ -93,6 +42,10 @@ jobs:
     needs: release
     runs-on: arc-runner-k8s
     steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        ref: main  
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
     - name: Set up Docker Context for Buildx
@@ -113,6 +66,7 @@ jobs:
     - name: Build and push
       uses: docker/build-push-action@v5
       with:
+        context: .
         push: true
         tags: unipoll/api:${{ needs.release.outputs.version }}, unipoll/api:latest
   pypi:
@@ -139,6 +93,8 @@ jobs:
         python -m pip install build
     - name: Download source code
       uses: actions/checkout@v3
+      with:
+        ref: main
     - name: Build package distributions
       run: |
         python -m build