diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2076787bc..88e8e638a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -115,6 +115,7 @@ jobs: python-version: ["3.9", "3.12"] # 3.9 is the lowest version pre-commit supports env: LOCK_FILE_LOCATION: .ci-package-locks/code-quality/python${{ matrix.python-version }}.txt + DIFF_FILE_LOCATION: diff-code-quality-python${{ matrix.python-version }}.txt steps: - uses: actions/checkout@v4 @@ -140,8 +141,8 @@ jobs: mkdir -p .ci-package-locks/code-quality pip install pre-commit pip freeze --exclude solara --exclude solara-enterprise > ${{ env.LOCK_FILE_LOCATION }} - git diff --exit-code | tee diff-code-quality-python${{ matrix.python-version }}.txt - [ -s diff-code-quality-python${{ matrix.python-version }}.txt ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT" + git diff --exit-code | tee ${{ env.DIFF_FILE_LOCATION }} + [ -s ${{ env.DIFF_FILE_LOCATION }} ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT" - name: Install if: github.event_name != 'schedule' && steps.prepare.outputs.LOCKS_EXIST == 'true' @@ -159,7 +160,7 @@ jobs: with: name: test-results-code-quality-python${{ matrix.python-version }} path: | - diff-code-quality-python${{ matrix.python-version }}.txt + ${{ env.DIFF_FILE_LOCATION }} ./**/${{ env.LOCK_FILE_LOCATION }} - name: Upload CI package locks @@ -248,6 +249,7 @@ jobs: ipywidgets: "8.0" env: LOCK_FILE_LOCATION: .ci-package-locks/integration/os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }}.txt + DIFF_FILE_LOCATION: diff-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }}.txt steps: - uses: actions/checkout@v4 @@ -296,8 +298,8 @@ jobs: pip install `echo packages/solara-enterprise/dist/*.whl`[ssg,auth] pip install "jupyterlab<4" "pydantic<2" "playwright==1.41.2" "ipywidgets~=${{ matrix.ipywidgets }}" pip freeze --exclude solara --exclude solara-ui --exclude solara-server --exclude pytest-ipywidgets --exclude solara-enterprise > ${{ env.LOCK_FILE_LOCATION }} - git diff --exit-code | tee diff-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }}.txt - [ -s diff-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }}.txt ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT" + git diff --exit-code | tee ${{ env.DIFF_FILE_LOCATION }} + [ -s ${{ env.DIFF_FILE_LOCATION }} ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT" - name: Install if: github.event_name != 'schedule' && steps.prepare.outputs.LOCKS_EXIST == 'true' @@ -331,7 +333,7 @@ jobs: name: test-results-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }} path: | test-results - diff-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }}.txt + ${{ env.DIFF_FILE_LOCATION }} ./**/${{ env.LOCK_FILE_LOCATION }} - name: Upload CI package locks @@ -359,6 +361,7 @@ jobs: ipywidgets: "8.0" env: LOCK_FILE_LOCATION: .ci-package-locks/integration-vue3/os${{ matrix.os }}-ipywidgets${{ matrix.ipywidgets_major }}.txt + DIFF_FILE_LOCATION: diff-integration-vue3-os${{ matrix.os }}-ipywidgets${{ matrix.ipywidgets_major }}.txt steps: - uses: actions/checkout@v4 @@ -402,8 +405,8 @@ jobs: pip install jupyter_core jupyter-packaging pip install --pre ipyvue ipyvuetify pip freeze --exclude solara --exclude solara-ui --exclude solara-server --exclude pytest-ipywidgets --exclude solara-enterprise > ${{ env.LOCK_FILE_LOCATION }} - git diff --exit-code | tee diff-integration-vue3-os${{ matrix.os }}-ipywidgets${{ matrix.ipywidgets_major }}.txt - [ -s diff-integration-vue3-os${{ matrix.os }}-ipywidgets${{ matrix.ipywidgets_major }}.txt ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT" + git diff --exit-code | tee ${{ env.DIFF_FILE_LOCATION }} + [ -s ${{ env.DIFF_FILE_LOCATION }} ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT" - name: Install if: github.event_name != 'schedule' && steps.prepare.outputs.LOCKS_EXIST == 'true' @@ -437,7 +440,7 @@ jobs: name: test-results-integration-vue3-os${{ matrix.os }}-ipywidgets${{ matrix.ipywidgets_major }} path: | test-results - diff-integration-vue3-os${{ matrix.os }}-ipywidgets${{ matrix.ipywidgets_major }}.txt + ${{ env.DIFF_FILE_LOCATION }} ./**/${{ env.LOCK_FILE_LOCATION }} - name: Upload CI package locks @@ -467,6 +470,7 @@ jobs: ipywidgets: "8.0" env: LOCK_FILE_LOCATION: .ci-package-locks/unit/os${{ matrix.os }}-python${{ matrix.python }}-ipywidgets${{ matrix.ipywidgets }}.txt + DIFF_FILE_LOCATION: diff-unit-os${{ matrix.os }}-python${{ matrix.python }}-ipywidgets${{ matrix.ipywidgets }}.txt steps: - uses: actions/checkout@v4 @@ -502,8 +506,8 @@ jobs: pip install `echo packages/solara-enterprise/dist/*.whl`[ssg,auth] pip install "jupyterlab<4" diskcache redis "ipywidgets~=${{ matrix.ipywidgets }}" pip freeze --exclude solara --exclude solara-ui --exclude solara-server --exclude pytest-ipywidgets --exclude solara-enterprise > ${{ env.LOCK_FILE_LOCATION }} - git diff --exit-code | tee diff-unit-os${{ matrix.os }}-python${{ matrix.python }}-ipywidgets${{ matrix.ipywidgets }}.txt - [ -s diff-unit-os${{ matrix.os }}-python${{ matrix.python }}-ipywidgets${{ matrix.ipywidgets }}.txt ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT" + git diff --exit-code | tee ${{ env.DIFF_FILE_LOCATION }} + [ -s ${{ env.DIFF_FILE_LOCATION }} ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT" - name: Install if: github.event_name != 'schedule' && steps.prepare.outputs.LOCKS_EXIST == 'true' @@ -532,7 +536,7 @@ jobs: with: name: test-results-unit-os${{ matrix.os }}-python${{ matrix.python }}-ipywidgets${{ matrix.ipywidgets }} path: | - diff-unit-os${{ matrix.os }}-python${{ matrix.python }}-ipywidgets${{ matrix.ipywidgets }}.txt + ${{ env.DIFF_FILE_LOCATION }} ./**/${{ env.LOCK_FILE_LOCATION }} - name: Upload CI package locks