diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 28447f5b2b0..c01dd0170d0 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -86,7 +86,7 @@ jobs: with: crate: taplo-cli locked: true - hash: ${{ inputs.upload && '20.04' || '22.04' }} + cache-key: ${{ inputs.upload && '20.04' || '22.04' }} - name: Bootstrap Python run: python3 -m pip install --upgrade pip - name: Bootstrap dependencies @@ -180,4 +180,3 @@ jobs: - name: Mark the job as unsuccessful run: exit 1 if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') - diff --git a/python/requirements.txt b/python/requirements.txt index 959ef9966b5..be543c41ccf 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -5,8 +5,8 @@ blessings == 1.7 distro == 1.4 mozinfo == 1.2.1 mozlog == 7.1.0 -setuptools == 68.2.2; python_version >= "3.8" -setuptools == 65.5.1; python_version < "3.8" +setuptools == 68.2.2; python_version > "3.8" +setuptools == 65.5.1; python_version <= "3.8" toml == 0.9.2 dataclasses == 0.8; python_version < "3.7"