Upgrade version to 1.1.5

snok · May 21, 2021 · f0e6185 · f0e6185
1 parent 9a715c7
commit f0e6185
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 63 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on: pull_request
 
 env:
   # JSON variables (used in our strategy/matrix)
-  SUPPORTED_POETRY_VERSIONS: '\"poetry-version\":[\"1.1.0\", \"1.1.2\", \"1.1.4\", \"1.1.5\", \"1.1.6\", \"1.2.0a1\"]'
+  SUPPORTED_POETRY_VERSIONS: '\"poetry-version\":[\"1.1.0\", \"1.1.2\", \"1.1.4\", \"1.1.5\", \"1.1.6\"]'
   SUPPORTED_PYTHON_VERSIONS: '\"python-version\":[\"3.7\", \"3.8\", \"3.9\"]'
   SUPPORTED_OPERATING_SYSTEMS: '\"os\":[\"ubuntu-latest\", \"macos-latest\", \"windows-latest\"]'
 
@@ -40,35 +40,35 @@ jobs:
       # matrix:
       #   - os: [ubuntu-latest, ...]
     steps:
-    - id: set-matrix-vars
-      run: |
-        echo "::set-output name=full-matrix::{${{ env.SUPPORTED_POETRY_VERSIONS }},${{ env.SUPPORTED_PYTHON_VERSIONS }},${{ env.SUPPORTED_OPERATING_SYSTEMS }}}"
-        echo "::set-output name=py-os-matrix::{${{ env.SUPPORTED_PYTHON_VERSIONS }},${{ env.SUPPORTED_OPERATING_SYSTEMS }}}"
-        echo "::set-output name=os-matrix::{${{ env.SUPPORTED_OPERATING_SYSTEMS }}}"
+      - id: set-matrix-vars
+        run: |
+          echo "::set-output name=full-matrix::{${{ env.SUPPORTED_POETRY_VERSIONS }},${{ env.SUPPORTED_PYTHON_VERSIONS }},${{ env.SUPPORTED_OPERATING_SYSTEMS }}}"
+          echo "::set-output name=py-os-matrix::{${{ env.SUPPORTED_PYTHON_VERSIONS }},${{ env.SUPPORTED_OPERATING_SYSTEMS }}}"
+          echo "::set-output name=os-matrix::{${{ env.SUPPORTED_OPERATING_SYSTEMS }}}"
 
-  # This job makes sure that the install-poetry action works,
-  # using the default settings, on all combinations of Python versions,
-  # Poetry versions, and operating systems that we want to test
-  test-supported-os-python-poetry:
-    needs: set-env
-    strategy:
-      fail-fast: true
-      matrix: ${{fromJson(needs.set-env.outputs.full-matrix)}}
-    defaults:
-      run:
-        shell: bash
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ./
-        with:
-          version: ${{ matrix.poetry-version }}
-      - uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - run: poetry install --no-root --no-interaction
-      - run: poetry install --no-interaction
-      - run: poetry run pytest --version
+#  # This job makes sure that the install-poetry action works,
+#  # using the default settings, on all combinations of Python versions,
+#  # Poetry versions, and operating systems that we want to test
+#  test-supported-os-python-poetry:
+#    needs: set-env
+#    strategy:
+#      fail-fast: true
+#      matrix: ${{fromJson(needs.set-env.outputs.full-matrix)}}
+#    defaults:
+#      run:
+#        shell: bash
+#    runs-on: ${{ matrix.os }}
+#    steps:
+#      - uses: actions/checkout@v2
+#      - uses: ./
+#        with:
+#          version: ${{ matrix.poetry-version }}
+#      - uses: actions/setup-python@v2
+#        with:
+#          python-version: ${{ matrix.python-version }}
+#      - run: poetry install --no-root --no-interaction
+#      - run: poetry install --no-interaction
+#      - run: poetry run pytest --version
 
   # Makes sure not creating a venv works
   test-create-venv-false:
@@ -146,6 +146,23 @@ jobs:
           source $VENV
           pytest --version
 
+  # Makes sure caching works (this is sort of redundant)
+  temp:
+    needs: set-env
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.set-env.outputs.os-matrix)}}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - name: Install poetry
+        uses: ./
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+      - run: poetry --version
+
   # Makes sure all operating system combinations can activate venvs
   # using the custom install-poetry $VENV environment variable
   test-venv-env-var:
@@ -171,12 +188,13 @@ jobs:
           source $VENV
           pytest --version
 
-  # Makes sure scripts are not deleted.
-  # If we deleted the script by accident, old versions of the action would fail
-  test-v11-script:
+  # Make sure scripts are not deleted.
+  # If we deleted the scripts folder (or subfolders) by accident,
+  # different versions of the action would fail
+  test-scripts-exist:
     runs-on: ubuntu-latest
     steps:
       # v1.1 script loaded in < 1.1.4
       - uses: snok/install-poetry@v1.1.4
 #      # v1.2 script loaded in > 1.1.4
-#      - uses: snok/install-poetry@v1.1.5
+#      - uses: snok/install-poetry@v1.1.5
diff --git a/README.md b/README.md
@@ -15,14 +15,14 @@ If all you need is default Poetry, simply add this to your workflow:
 
 ```yaml
 - name: Install Poetry
-  uses: snok/install-poetry@v1.1.4
+  uses: snok/install-poetry@v1.1.5
 ```
 
 If you want to set Poetry config settings, or install a specific version, you can specify inputs
 
 ```yaml
 - name: Install and configure Poetry
-  uses: snok/install-poetry@v1.1.4
+  uses: snok/install-poetry@v1.1.5
   with:
     version: 1.1.6
     virtualenvs-create: true
@@ -49,7 +49,7 @@ or just to make changes to the Poetry config *after* invoking the action -
 you can do so in a subsequent step, like this
 
 ```yaml
-- uses: snok/install-poetry@v1.1.4
+- uses: snok/install-poetry@v1.1.5
 - run: poetry config experimental.new-installer false
 ```
 
@@ -96,7 +96,7 @@ jobs:
       #  -----  install & configure poetry  -----      
       #----------------------------------------------
       - name: Install Poetry
-        uses: snok/install-poetry@v1.1.4
+        uses: snok/install-poetry@v1.1.5
         with:
           virtualenvs-create: true
           virtualenvs-in-project: true
@@ -192,7 +192,7 @@ jobs:
       #  -----  install & configure poetry  -----      
       #----------------------------------------------
       - name: Install Poetry
-        uses: snok/install-poetry@v1.1.4
+        uses: snok/install-poetry@v1.1.5
         with:
           virtualenvs-create: true
           virtualenvs-in-project: true
@@ -259,7 +259,7 @@ jobs:
       #  -----  install & configure poetry  -----      
       #----------------------------------------------
     - name: Install Poetry
-      uses: snok/install-poetry@v1.1.4
+      uses: snok/install-poetry@v1.1.5
       with:
         virtualenvs-create: true
         virtualenvs-in-project: true
@@ -360,7 +360,7 @@ jobs:
         with:
           python-version: 3.9
       - name: Install Poetry
-        uses: snok/install-poetry@v1.1.4
+        uses: snok/install-poetry@v1.1.5
         with:
           virtualenvs-create: true
           virtualenvs-in-project: true
@@ -395,7 +395,7 @@ All of the examples we've added use these Poetry settings
 
 ```yaml
 - name: Install Poetry
-  uses: snok/install-poetry@v1.1.4
+  uses: snok/install-poetry@v1.1.5
   with:
     virtualenvs-create: true
     virtualenvs-in-project: true

diff --git a/action.yml b/action.yml
@@ -26,12 +26,18 @@ runs:
   steps:
     - name: Install and configure Poetry
       run: |
-        install_poetry="$(mktemp)"
-        curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/48339106eb0d403a3c66519317488c8185844b32/install-poetry.py --output "$install_poetry"
-        python3 $install_poetry --yes --version=${{ inputs.version }}
+        installation_script="$(mktemp)"
+        curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/48339106eb0d403a3c66519317488c8185844b32/install-poetry.py --output "$installation_script"
 
-        install="$(mktemp)"
-        curl -sSL https://raw.githubusercontent.com/snok/install-poetry/v1.2/scripts/v1.2/main.sh --output "$install"
-        chmod +x "$install"
-        $install ${{ runner.os }} ${{ inputs.virtualenvs-create }} ${{ inputs.virtualenvs-in-project }} ${{ inputs.virtualenvs-path }}
-      shell: bash
+        config_script="$(mktemp)"
+        curl -sSL https://raw.githubusercontent.com/snok/install-poetry/v1.2/scripts/v1.2/main.sh --output "$config_script"
+        chmod +x "$config_script"
+
+        $config_script \
+          ${{ runner.os }} \
+          ${{ inputs.virtualenvs-create }} \
+          ${{ inputs.virtualenvs-in-project }} \
+          ${{ inputs.virtualenvs-path }} \
+          ${{ inputs.version }} \
+          $installation_script
+      shell: bash
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "install-poetry"
-version = "1.1.4"
+version = "1.1.5"
 description = ""
 authors = ["Sondre Lillebø Gundersen <sondrelg@live.no.com>"]
 maintainers = ["Jonas Krüger Svensson <jonasks@hotmail.com>"]

diff --git a/scripts/v1.2/main.sh b/scripts/v1.2/main.sh
@@ -5,16 +5,18 @@ os=$1
 venv_create=$2
 venv_in_project=$3
 venv_path=$4
+version=$5
+installation_script=$6
 
 # Define OS specific help text
 if [ "$os" == "Windows" ]; then
   conf="\033[33mConfiguring Poetry for Windows!\033[0m"
   act="source .venv/scripts/activate"
-  echo "VENV=.venv/scripts/activate" >> "$GITHUB_ENV"
+  echo "VENV=.venv/scripts/activate" >>"$GITHUB_ENV"
 else
   conf="\033[33mConfiguring Poetry!\033[0m"
   act="source .venv/bin/activate"
-  echo "VENV=.venv/bin/activate" >> "$GITHUB_ENV"
+  echo "VENV=.venv/bin/activate" >>"$GITHUB_ENV"
 fi
 
 # Echo help texts
@@ -32,22 +34,26 @@ fi
 echo -e '\n-------------------------------------------------------------------------------\n'
 
 if [ "$os" == "Windows" ]; then
-  # Define path
-  path="C:/Users/runneradmin/AppData/Roaming/Python/Scripts/poetry.exe"
+  path="C:/Users/runneradmin/AppData/Roaming/Python/Scripts/"
+else
+  path="$HOME/.local/"
+fi
 
-  # Configure Poetry
-  poetry config virtualenvs.create "$venv_create"
-  poetry config virtualenvs.in-project "$venv_in_project"
-  poetry config virtualenvs.path "$venv_path"
+POETRY_HOME=$path python3 $installation_script --yes --version=$version
+
+echo "$path/bin" >>$GITHUB_PATH
+export PATH="$path/bin:$PATH"
 
-  # Add system path, so the executable is made available in the next workflow steps
-  echo "C:/Users/runneradmin/AppData/Roaming/Python/Scripts/" >> $GITHUB_PATH
+if [ "$os" == "Windows" ]; then
+  # Adding to path on windows doesn't immediately take effect
+  # so calling the executable directly here - should be available
+  # in next steps regardless.
+  "$path/bin/poetry.exe" config virtualenvs.create "$venv_create"
+  "$path/bin/poetry.exe" config virtualenvs.in-project "$venv_in_project"
+  "$path/bin/poetry.exe" config virtualenvs.path "$venv_path"
 else
-  PATH="$HOME/.local/bin:$PATH"
   poetry config virtualenvs.create "$venv_create"
   poetry config virtualenvs.in-project "$venv_in_project"
   poetry config virtualenvs.path "$venv_path"
-  echo "$HOME/.local/bin" >> $GITHUB_PATH
 fi
 
-