diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml index c1a3f281..72f8666f 100644 --- a/.github/workflows/analysis-coverage.yml +++ b/.github/workflows/analysis-coverage.yml @@ -576,12 +576,20 @@ jobs: kill -15 $(cat /tmp/_install.pid) timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null + - name: Talk Branch Main + if: ${{ startsWith(matrix.nextcloud, 'master') }} + run: echo "TALK_BRANCH_NAME=main" >> $GITHUB_ENV + + - name: Talk Branch Other + if: ${{ !startsWith(matrix.nextcloud, 'master') }} + run: echo "TALK_BRANCH_NAME=${{ matrix.nextcloud }}" >> $GITHUB_ENV + - name: Checkout Talk uses: actions/checkout@v4 with: path: apps/spreed repository: nextcloud/spreed - ref: ${{ matrix.nextcloud }} + ref: ${{ env.TALK_BRANCH_NAME }} - name: Install Talk working-directory: apps/spreed @@ -726,12 +734,20 @@ jobs: kill -15 $(cat /tmp/_install.pid) timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null + - name: Talk Branch Main + if: ${{ startsWith(matrix.nextcloud, 'master') }} + run: echo "TALK_BRANCH_NAME=main" >> $GITHUB_ENV + + - name: Talk Branch Other + if: ${{ !startsWith(matrix.nextcloud, 'master') }} + run: echo "TALK_BRANCH_NAME=${{ matrix.nextcloud }}" >> $GITHUB_ENV + - name: Checkout Talk uses: actions/checkout@v4 with: path: apps/spreed repository: nextcloud/spreed - ref: ${{ matrix.nextcloud }} + ref: ${{ env.TALK_BRANCH_NAME }} - name: Install Talk working-directory: apps/spreed @@ -847,12 +863,20 @@ jobs: working-directory: nc_py_api run: python3 -m pip -v install . pytest coverage pillow + - name: Talk Branch Main + if: ${{ startsWith(matrix.nextcloud, 'master') }} + run: echo "TALK_BRANCH_NAME=main" >> $GITHUB_ENV + + - name: Talk Branch Other + if: ${{ !startsWith(matrix.nextcloud, 'master') }} + run: echo "TALK_BRANCH_NAME=${{ matrix.nextcloud }}" >> $GITHUB_ENV + - name: Checkout Talk uses: actions/checkout@v4 with: path: apps/spreed repository: nextcloud/spreed - ref: ${{ matrix.nextcloud }} + ref: ${{ env.TALK_BRANCH_NAME }} - name: Install Talk working-directory: apps/spreed diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 34e83163..f133c6e7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,7 +24,7 @@ repos: ) - repo: https://github.com/psf/black - rev: 23.10.0 + rev: 23.10.1 hooks: - id: black files: >- @@ -36,12 +36,12 @@ repos: ) - repo: https://github.com/tox-dev/pyproject-fmt - rev: 1.2.0 + rev: 1.3.0 hooks: - id: pyproject-fmt - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.1 + rev: v0.1.3 hooks: - id: ruff