diff --git a/.github/actions/run-backend-tests/action.yml b/.github/actions/run-backend-tests/action.yml index 050df40098242..3f13a10f1e6dc 100644 --- a/.github/actions/run-backend-tests/action.yml +++ b/.github/actions/run-backend-tests/action.yml @@ -44,9 +44,11 @@ runs: run: echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} + cache: pip + cache-dependency-path: '**/requirements*.txt' token: ${{ inputs.token }} - name: Determine if hogql-parser has changed compared to master @@ -85,9 +87,6 @@ runs: with: custom_cache_key_element: v2 - - uses: syphar/restore-pip-download-cache@v1 - if: steps.cache-backend-tests.outputs.cache-hit != 'true' - - name: Install Python dependencies if: steps.cache-backend-tests.outputs.cache-hit != 'true' shell: bash diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index caf194fc9c1b8..465ed1e734836 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -52,17 +52,16 @@ jobs: docker compose -f docker-compose.dev.yml up -d - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.10.10 + cache: 'pip' + cache-dependency-path: '**/requirements*.txt' token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }} - uses: syphar/restore-virtualenv@v1 id: cache-benchmark-tests - - uses: syphar/restore-pip-download-cache@v1 - if: steps.cache-benchmark-tests.outputs.cache-hit != 'true' - - name: Install SAML (python3-saml) dependencies shell: bash run: | diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml index a346ec59367a7..b400690f2d623 100644 --- a/.github/workflows/ci-backend.yml +++ b/.github/workflows/ci-backend.yml @@ -103,9 +103,11 @@ jobs: fetch-depth: 1 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.10.10 + cache: 'pip' + cache-dependency-path: '**/requirements*.txt' token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }} - uses: syphar/restore-virtualenv@v1 @@ -113,9 +115,6 @@ jobs: with: custom_cache_key_element: v2- - - uses: syphar/restore-pip-download-cache@v1 - if: steps.cache-backend-tests.outputs.cache-hit != 'true' - - name: Install SAML (python3-saml) dependencies run: | sudo apt-get update @@ -181,9 +180,11 @@ jobs: docker compose -f docker-compose.dev.yml up -d - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.10.10 + cache: 'pip' + cache-dependency-path: '**/requirements*.txt' token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }} - uses: syphar/restore-virtualenv@v1 @@ -191,9 +192,6 @@ jobs: with: custom_cache_key_element: v1- - - uses: syphar/restore-pip-download-cache@v1 - if: steps.cache-backend-tests.outputs.cache-hit != 'true' - - name: Install SAML (python3-saml) dependencies run: | sudo apt-get update @@ -325,9 +323,11 @@ jobs: docker compose -f docker-compose.dev.yml up -d - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.10.10 + cache: 'pip' + cache-dependency-path: '**/requirements*.txt' token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }} - uses: syphar/restore-virtualenv@v1 @@ -335,9 +335,6 @@ jobs: with: custom_cache_key_element: v2- - - uses: syphar/restore-pip-download-cache@v1 - if: steps.cache-backend-tests.outputs.cache-hit != 'true' - - name: Install SAML (python3-saml) dependencies run: | sudo apt-get update diff --git a/.github/workflows/ci-hobby.yml b/.github/workflows/ci-hobby.yml index 9985a4402118b..c5b878c8d2184 100644 --- a/.github/workflows/ci-hobby.yml +++ b/.github/workflows/ci-hobby.yml @@ -31,6 +31,7 @@ jobs: with: python-version: '3.8' cache: 'pip' # caching pip dependencies + cache-dependency-path: '**/requirements*.txt' token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }} - name: Get python deps run: pip install python-digitalocean==1.17.0 requests==2.28.1 diff --git a/.github/workflows/ci-plugin-server.yml b/.github/workflows/ci-plugin-server.yml index f3de714c764e2..b945184730104 100644 --- a/.github/workflows/ci-plugin-server.yml +++ b/.github/workflows/ci-plugin-server.yml @@ -115,9 +115,11 @@ jobs: - name: Set up Python if: needs.changes.outputs.plugin-server == 'true' - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.10.10 + cache: 'pip' + cache-dependency-path: '**/requirements*.txt' token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }} - uses: syphar/restore-virtualenv@v1 @@ -126,9 +128,6 @@ jobs: with: custom_cache_key_element: v1- - - uses: syphar/restore-pip-download-cache@v1 - if: needs.changes.outputs.plugin-server == 'true' && steps.cache-backend-tests.outputs.cache-hit != 'true' - - name: Install SAML (python3-saml) dependencies if: needs.changes.outputs.plugin-server == 'true' run: | @@ -213,9 +212,11 @@ jobs: run: echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.10.10 + cache: 'pip' + cache-dependency-path: '**/requirements*.txt' token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }} - uses: syphar/restore-virtualenv@v1 @@ -223,9 +224,6 @@ jobs: with: custom_cache_key_element: v1- - - uses: syphar/restore-pip-download-cache@v1 - if: steps.cache-backend-tests.outputs.cache-hit != 'true' - - name: Install SAML (python3-saml) dependencies run: | sudo apt-get update