Merge pull request #707 from mbonish/windows_build_fix

Windows build fix  in actions pkg and release to include version and variant tags

Author: adorton-adobe

.github/workflows/package-release.yml

@@ -4,11 +4,10 @@ on:
   push:
     tags:
     - 'v*'
-  workflow_dispatch:
 
-jobs: 
+jobs:
   ubuntu:
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
@@ -18,21 +17,20 @@ jobs:
             variant_tag: ""
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 
+    - name: Set up Python
       uses: actions/setup-python@v2
       with:
         python-version: '3.6'
     - name: Get version tag
       id: get_version
       uses: battila7/get-version-action@v2
     - name: Ubuntu-Install dependencies
-      run: | 
+      run: |
         sudo apt-get update
         sudo apt-get install -y software-properties-common
         sudo apt-get install -y build-essential
         sudo apt-get install -y python3-dev python3-pip python3-virtualenv
         sudo apt-get install -y pkg-config libssl-dev libdbus-1-dev libdbus-glib-1-dev python-dbus libffi-dev libkrb5-dev
-
     - run: |
         pip install external/okta-0.0.3.1-py2.py3-none-any.whl
         pip install -e .
@@ -47,8 +45,8 @@ jobs:
     - name: Get build
       run: |
         cd dist
-        tar czf "user-sync-${UST_VERSION}${UST_VARIANT_TAG}-ubuntu.tar.gz" user-sync
-      env:  
+        tar czf "user-sync-$UST_VERSION $UST_VARIANT_TAG-ubuntu.tar.gz" user-sync
+      env:
         UST_VARIANT_TAG: ${{matrix.variant_tag}}
         UST_VERSION: ${{ steps.get_version.outputs.version }}
     - name: Make artifacts
@@ -57,7 +55,8 @@ jobs:
           name: user-sync-artifact
           path: dist/*.tar.gz
           retention-days: 5
-   
+
+
   windows:
     runs-on: windows-latest
     strategy:
@@ -67,40 +66,36 @@ jobs:
             variant_tag: "-noext"
           - extension_support: 1
             variant_tag: ""
-    steps: 
+    steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
         python-version: '3.6'
+    - name: Get version tag
+      id: get_version
+      uses: battila7/get-version-action@v2
     - run: |
         pip install external/okta-0.0.3.1-py2.py3-none-any.whl
         pip install -e .
         pip install -e .[test]
         pip install -e .[setup]
-    - name: Make Standalone
-      run: |
-        make standalone
+    - run: make standalone
       env:
         UST_EXTENSION: ${{matrix.extension_support}}
     - name: Test with pytest
       run: pytest
-    - name: Get version tag
-      id: get_version
-      uses: battila7/get-version-action@v2
-    - name: zip 
+    - name: Get build
       run: |
          cd dist
-         7z a user-sync-${UST_VERSION}${UST_VARIANT_TAG}-win64.zip user-sync.exe
-      env:
-         UST_VARIANT_TAG: ${{matrix.variant_tag}}
-         UST_VERSION: ${{ steps.get_version.outputs.version }}
+         7z a user-sync-${{ steps.get_version.outputs.version }}${{matrix.variant_tag}}-win64.zip user-sync.exe
     - name: Make artifact
       uses: actions/upload-artifact@v2
       with:
         name: user-sync-artifact
         path: dist/*.zip
         retention-days: 5
-  
+
+
   centos:
     runs-on: ubuntu-latest
     env:
@@ -117,6 +112,9 @@ jobs:
             variant_tag: ""
     steps:
       - uses: actions/checkout@v2
+      - name: Get version tag
+        id: get_version
+        uses: battila7/get-version-action@v2
       - name: Centos-Install dependencies
         run: |
           yum install -y epel-release
@@ -137,24 +135,20 @@ jobs:
           UST_EXTENSION: ${{matrix.extension_support}}
       - name: Test with pytest
         run: pytest -s
-      - name: Get version tag
-        id: get_version
-        uses: battila7/get-version-action@v2
       - name: Get build
         run: |
           cd dist
           tar czf "user-sync-${UST_VERSION}${UST_VARIANT_TAG}-centos.tar.gz" user-sync
         env:
           UST_VARIANT_TAG: ${{matrix.variant_tag}}
           UST_VERSION: ${{ steps.get_version.outputs.version }}
-      - name: make atrifact
+      - name: Make artifact
         uses: actions/upload-artifact@v2
         with:
           name: user-sync-artifact
           path: dist/*.tar.gz
           retention-days: 5
-    
-    
+
 
   examples:
     runs-on: ubuntu-latest
@@ -178,42 +172,34 @@ jobs:
         path: user-sync-examples.tar.gz
         retention-days: 5
 
-  release:
-    runs-on: ubuntu-latest
-    needs: [ubuntu,windows, centos, examples]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: user-sync ${{ github.ref }}
-        body_path: .changelog/latest.md
-        draft: true
-        prerelease: false
-
-  upload-assets:
-    needs: release
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/download-artifact@v2
-    - name: Get version tag
-      id: get_version
-      uses: battila7/get-version-action@v2
-    - run: ls -R
-    - uses: fnkr/github-action-ghr@v1
-      if: startsWith(github.ref, 'refs/tags/')
-      env:
-        GHR_PATH: user-sync-artifact/
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
-
-
-
-
-
-
+#  release:
+#    runs-on: ubuntu-latest
+#    needs: [ubuntu,windows, centos, examples]
+#    steps:
+#    - uses: actions/checkout@v2
+#    - name: Create Release
+#      id: create_release
+#      uses: actions/create-release@v1
+#      env:
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#      with:
+#        tag_name: ${{ github.ref }}
+#        release_name: user-sync ${{ github.ref }}
+#        body_path: .changelog/latest.md
+#        draft: true
+#        prerelease: false
+#
+#  upload-assets:
+#    needs: release
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: actions/download-artifact@v2
+#    - name: Get version tag
+#      id: get_version
+#      uses: battila7/get-version-action@v2
+#    - run: ls -R
+#    - uses: fnkr/github-action-ghr@v1
+#      if: startsWith(github.ref, 'refs/tags/')
+#      env:
+#        GHR_PATH: user-sync-artifact/
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}