From 3544007476fef27b7d52e6246a69a26dbf330daa Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Wed, 2 Oct 2024 13:35:40 +0100 Subject: [PATCH 1/2] . --- .github/actions/setup-python/action.yml | 4 +-- .github/actions/setup-rye/action.yml | 45 ------------------------- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 .github/actions/setup-rye/action.yml diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml index cc75d64..304b7e8 100644 --- a/.github/actions/setup-python/action.yml +++ b/.github/actions/setup-python/action.yml @@ -1,5 +1,5 @@ -name: "Setup Rust" -description: "Toolchain setup and Initial compilation" +name: "Setup Python" +description: "Initial Python adn Rye setup" inputs: rye-version: description: "Rye version to use" diff --git a/.github/actions/setup-rye/action.yml b/.github/actions/setup-rye/action.yml deleted file mode 100644 index 645de5c..0000000 --- a/.github/actions/setup-rye/action.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: 'Setup Rye' -description: 'Rye toolchain setup' -inputs: - rye-version: - description: 'Rye version to use' - required: true - default: '0.38.0' -runs: - using: "composite" - steps: - - name: Rye Cache - id: rye-cache - uses: actions/cache@v4 - with: - path: ~/.rye - key: "rye-${{ runner.os }}-${{ inputs.rye-version }}" - - - name: Rye Install - shell: bash - run: curl -sSf https://rye.astral.sh/get | bash - if: steps.rye-cache.outputs.cache-hit != 'true' - env: - RYE_VERSION: "${{ inputs.rye-version }}" - RYE_INSTALL_OPTION: "--yes" - - - name: Rye Shims - shell: bash - run: echo "$HOME/.rye/shims" >> $GITHUB_PATH - - - name: Venv Cache - id: venv-cache - uses: actions/cache@v4 - with: - path: .venv - key: "venv-${{ runner.os }}-${{ hashFiles('requirements**.lock') }}" - - - name: Rye Sync - shell: bash - # --no-lock prevents resolution of the lock file. The locks are still respected. - # We always run `rye sync` even if the cache fetch was successful since it builds our Rust extensions for us. - run: rye sync --no-lock - - - name: Export Path - shell: bash - run: echo "PATH=$PATH" >> $GITHUB_ENV \ No newline at end of file From d05b0dc79cc8bd58edd569cfb91350d80b023a91 Mon Sep 17 00:00:00 2001 From: Adam Gutglick Date: Wed, 2 Oct 2024 13:36:21 +0100 Subject: [PATCH 2/2] . --- .github/actions/setup-python/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml index 304b7e8..ef29292 100644 --- a/.github/actions/setup-python/action.yml +++ b/.github/actions/setup-python/action.yml @@ -1,5 +1,5 @@ name: "Setup Python" -description: "Initial Python adn Rye setup" +description: "Initial Python and Rye setup" inputs: rye-version: description: "Rye version to use"