FIX: artifact paths (#22)

* FIX: fix artifact download

Downloaded artifacts are _always_ put into a directory, even if the
artifact itself is a file.

* CHORE: update version

* REF: move tagging to end of job

Author: mplanchard

.github/workflows/ci.yml

@@ -389,38 +389,6 @@ jobs:
         run: |
           echo "::set-output name=new::$(./scripts/newCargoVersion.sh)"
 
-      - name: "Add Git Tag Ref for Version"
-        if: "${{ steps.cargo-version.outputs.new == 'true' }}"
-        uses: "actions/github-script@v2"
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          script: |
-            github.git.createRef({
-              owner: "${{ github.repository_owner }}",
-              repo: "json-logic-rs",
-              ref: "refs/tags/v${{ steps.get-version.outputs.version }}",
-              sha: "${{ github.sha }}",
-            })
-
-      - name: "Add GitHub Annotated Tag for Version"
-        if: "${{ steps.cargo-version.outputs.new == 'true' }}"
-        uses: "actions/github-script@v2"
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          script: |
-            github.git.createTag({
-              owner: "${{ github.repository_owner }}",
-              repo: "json-logic-rs",
-              tag: "v${{ steps.get-version.outputs.version }}",
-              message: "Vesrion ${{ steps.get-version.outputs.version }}",
-              object: "${{ github.sha }}",
-              type: "commit",
-              tagger: {
-                name: "${{ github.actor }}",
-                email: "[email protected]",
-              }
-            })
-
       - name: "Check if new NPM version"
         id: npm-version
         shell: bash
@@ -488,6 +456,38 @@ jobs:
           TWINE_USERNAME: "__token__"
           TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
 
+      - name: "Add Git Tag Ref for Version"
+        if: "${{ steps.cargo-version.outputs.new == 'true' }}"
+        uses: "actions/github-script@v2"
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          script: |
+            github.git.createRef({
+              owner: "${{ github.repository_owner }}",
+              repo: "json-logic-rs",
+              ref: "refs/tags/v${{ steps.get-version.outputs.version }}",
+              sha: "${{ github.sha }}",
+            })
+
+      - name: "Add GitHub Annotated Tag for Version"
+        if: "${{ steps.cargo-version.outputs.new == 'true' }}"
+        uses: "actions/github-script@v2"
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          script: |
+            github.git.createTag({
+              owner: "${{ github.repository_owner }}",
+              repo: "json-logic-rs",
+              tag: "v${{ steps.get-version.outputs.version }}",
+              message: "Vesrion ${{ steps.get-version.outputs.version }}",
+              object: "${{ github.sha }}",
+              type: "commit",
+              tagger: {
+                name: "${{ github.actor }}",
+                email: "[email protected]",
+              }
+            })
+
   distribute-py-wheels-mac-windows:
     name: "Distribute Mac and Windows Python Wheels"
     needs: ["distribute", "build-python-wheels-mac-windows"]
@@ -511,13 +511,12 @@ jobs:
         uses: "actions/download-artifact@v1"
         with:
           name: "new-cargo"
-          path: "tmp-new-cargo-ver"
 
       - name: "Check for new cargo version"
         id: cargo-version
         shell: bash
         run: |
-          echo "::set-output name=new::$(cat tmp-new-cargo-ver)"
+          echo "::set-output name=new::$(cat ./new-cargo/tmp-new-cargo-ver)"
 
       - name: "Pull Python Wheels"
         if: "${{ steps.cargo-version.outputs.new == 'true' }}"
@@ -564,13 +563,12 @@ jobs:
         uses: "actions/download-artifact@v1"
         with:
           name: "new-cargo"
-          path: "tmp-new-cargo-ver"
 
       - name: "Check for new cargo version"
         id: cargo-version
         shell: bash
         run: |
-          echo "::set-output name=new::$(cat tmp-new-cargo-ver)"
+          echo "::set-output name=new::$(cat ./new-cargo/tmp-new-cargo-ver)"
 
       - name: "Pull Python Wheel"
         if: "${{ steps.cargo-version.outputs.new == 'true' }}"

.gitignore

@@ -30,3 +30,4 @@ venv/
 
 # Used in the CI pipeline
 tmp-new-cargo-ver
+new-cargo/

Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT"
 name = "jsonlogic-rs"
 readme = "README.md"
 repository = "https://github.com/bestowinc/json-logic-rs"
-version = "0.1.2"
+version = "0.1.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html