Merge pull request #350 from kubilus1/oneunstable

One unstable package
kubilus1 · Sep 1, 2023 · 5690d7f · 5690d7f
2 parents e74b701 + 8552aa4
commit 5690d7f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -14,7 +14,10 @@ on:
         required: false
         type: boolean
         default: true
-
+      internalver:
+        required: false
+        type: string
+        default: ''
 
 jobs:
   build-linux:
@@ -31,6 +34,11 @@ jobs:
         sudo apt-get update && sudo apt-get install -y make ca-certificates
         sudo update-ca-certificates
 
+    - name: Optionally set internal version separately
+      if: ${{ inputs.internalver != '' }}
+      run: |
+        echo "${{ inputs.internalver }}" > autoortho/.version
+
     - name: Build
       run: |
         make lin_bin VERSION=${{ env.VERNAME }}
@@ -69,6 +77,11 @@ jobs:
           python -m pip install -U -r requirements.txt
           python -m pip install -U -r requirements-build.txt
 
+    - name: Optionally set internal version separately
+      if: ${{ inputs.internalver != '' }}
+      run: |
+        echo "${{ inputs.internalver }}" > autoortho/.version
+
     - name: Build
       run: |
         make win_exe VERSION=${{ env.VERNAME }}

diff --git a/.github/workflows/unstable_build.yml b/.github/workflows/unstable_build.yml
@@ -10,13 +10,15 @@ on:
   workflow_dispatch:
   push:
     branches: [ main ]
+  #pull_request:
 
 jobs:
   getcalver:
     runs-on: ubuntu-latest
     outputs:
       calver: ${{ steps.getcalver.outputs.CALVER }}
     steps:
+      - uses: actions/checkout@v3
       - name: Get CalVer
         id: getcalver
         run: |
@@ -26,5 +28,6 @@ jobs:
     needs: getcalver 
     uses: ./.github/workflows/build_release.yml
     with:
-      version: ${{ needs.getcalver.outputs.calver }}
+      version: unstable
+      internalver: ${{ needs.getcalver.outputs.calver }}
       relname: unstable