diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b944bad..452978a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,3 +12,10 @@ updates: versions: - ">= 3.11.a" - "< 3.12" +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly + time: "04:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f138e8b..769be12 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,16 +13,16 @@ jobs: contents: read steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Log in to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -30,23 +30,23 @@ jobs: # Documentation: https://github.com/docker/setup-qemu-action - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 # Documentation: https://github.com/docker/setup-buildx-action - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | wallabag/wallabag ghcr.io/${{ github.repository }} - name: Build and push Docker images - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb14cbe..d86d8d9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,17 +24,17 @@ jobs: steps: - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 2 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.11 - name: "Build image" - run: docker-compose -f tests/docker-compose.${{ matrix.database }}.yml build + run: docker compose -f tests/docker-compose.${{ matrix.database }}.yml build - name: "Install dependencies" run: pip install pytest pytest-docker requests @@ -44,8 +44,8 @@ jobs: - name: "Get docker logs" if: ${{ always() }} - run: docker-compose -p "wallabag_${{ matrix.database }}" -f tests/docker-compose.${{ matrix.database }}.yml logs wallabag + run: docker compose -p "wallabag_${{ matrix.database }}" -f tests/docker-compose.${{ matrix.database }}.yml logs wallabag - name: "Cleanup environment" if: ${{ always() }} - run: docker-compose -p "wallabag_${{ matrix.database }}" -f tests/docker-compose.${{ matrix.database }}.yml down -v + run: docker compose -p "wallabag_${{ matrix.database }}" -f tests/docker-compose.${{ matrix.database }}.yml down -v diff --git a/tests/test_login.py b/tests/test_login.py index adb6655..107faaf 100644 --- a/tests/test_login.py +++ b/tests/test_login.py @@ -28,7 +28,7 @@ def docker_cleanup(): @pytest.fixture(scope="session") def docker_compose_command() -> str: - return "docker-compose" + return "docker compose" @pytest.fixture(scope="session") def docker_compose_file(pytestconfig, database):