From c501b8f8f1df947aab66cc6b7a52b198c5c0f8ab Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Fri, 16 Feb 2024 10:12:58 -0500 Subject: [PATCH 1/5] chore: install pipenv to user dir in ci --- .github/actions/python/setup/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/python/setup/action.yaml b/.github/actions/python/setup/action.yaml index 8e41955e6d0..54a9f872f55 100644 --- a/.github/actions/python/setup/action.yaml +++ b/.github/actions/python/setup/action.yaml @@ -28,6 +28,6 @@ runs: run: | npm install --global shx@0.3.3 $OT_PYTHON -m pip install --upgrade pip - $OT_PYTHON -m pip install pipenv==2023.12.1 + $OT_PYTHON -m pip install --user pipenv==2023.12.1 - shell: bash run: 'make -C ${{ inputs.project }} setup' From 7cbf6818c79f3915771df2196efaad507c0f9c90 Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Fri, 16 Feb 2024 11:40:57 -0500 Subject: [PATCH 2/5] don't over-bash things --- .github/actions/python/setup/action.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/actions/python/setup/action.yaml b/.github/actions/python/setup/action.yaml index 54a9f872f55..86aa005bd55 100644 --- a/.github/actions/python/setup/action.yaml +++ b/.github/actions/python/setup/action.yaml @@ -18,16 +18,12 @@ runs: sudo apt-get install -y --no-install-recommends libsystemd-dev fi - name: Set the OT_PYTHON env variable - shell: bash run: echo "OT_PYTHON=$(which python)" >> $GITHUB_ENV - name: If provided set the OT_VIRTUALENV_VERSION env variable - shell : bash if: ${{ inputs.python-version != 'false' }} run: echo "OT_VIRTUALENV_VERSION=${{ inputs.python-version }}" >> $GITHUB_ENV - - shell: bash - run: | + - run: | npm install --global shx@0.3.3 $OT_PYTHON -m pip install --upgrade pip $OT_PYTHON -m pip install --user pipenv==2023.12.1 - - shell: bash - run: 'make -C ${{ inputs.project }} setup' + - run: 'make -C ${{ inputs.project }} setup' From b913e6b281a3aa1026e155719ded6f9e7916dbde Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Fri, 16 Feb 2024 11:52:51 -0500 Subject: [PATCH 3/5] split this out --- .github/actions/python/setup/action.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/actions/python/setup/action.yaml b/.github/actions/python/setup/action.yaml index 86aa005bd55..e5eed63085a 100644 --- a/.github/actions/python/setup/action.yaml +++ b/.github/actions/python/setup/action.yaml @@ -18,12 +18,17 @@ runs: sudo apt-get install -y --no-install-recommends libsystemd-dev fi - name: Set the OT_PYTHON env variable + shell: bash run: echo "OT_PYTHON=$(which python)" >> $GITHUB_ENV - name: If provided set the OT_VIRTUALENV_VERSION env variable + shell : bash if: ${{ inputs.python-version != 'false' }} run: echo "OT_VIRTUALENV_VERSION=${{ inputs.python-version }}" >> $GITHUB_ENV - - run: | - npm install --global shx@0.3.3 - $OT_PYTHON -m pip install --upgrade pip - $OT_PYTHON -m pip install --user pipenv==2023.12.1 - - run: 'make -C ${{ inputs.project }} setup' + - shell: bash + run: npm install --global shx@0.3.3 + - shell: bash + run: $OT_PYTHON -m pip install --upgrade pip + - shell: bash + run: $OT_PYTHON -m pip install --user pipenv==2023.12.1 + - shell: bash + run: 'make -C ${{ inputs.project }} setup' From bf3f2f156c28c94538bd2d34c977eae18798a05d Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Fri, 16 Feb 2024 11:53:55 -0500 Subject: [PATCH 4/5] this must go --- .github/workflows/notify-server-lint-test.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .github/workflows/notify-server-lint-test.yaml diff --git a/.github/workflows/notify-server-lint-test.yaml b/.github/workflows/notify-server-lint-test.yaml deleted file mode 100644 index e69de29bb2d..00000000000 From 1dfbcf9f9c2805911ac850e43f25524167f3da46 Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Fri, 16 Feb 2024 12:18:45 -0500 Subject: [PATCH 5/5] it bizarrely seems to only fail on the first go so you know what to do --- .github/actions/python/setup/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/python/setup/action.yaml b/.github/actions/python/setup/action.yaml index e5eed63085a..5e728acb9c9 100644 --- a/.github/actions/python/setup/action.yaml +++ b/.github/actions/python/setup/action.yaml @@ -31,4 +31,4 @@ runs: - shell: bash run: $OT_PYTHON -m pip install --user pipenv==2023.12.1 - shell: bash - run: 'make -C ${{ inputs.project }} setup' + run: 'make -C ${{ inputs.project }} setup || make -C ${{ inputs.project }} setup'