From 1e9dc89da18e9c88d048fccf5abbf9f2758c9c0b Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Thu, 2 Jan 2025 15:56:26 +0100 Subject: [PATCH] fixed detection changed files --- .github/workflows/run-tests.yaml | 13 ++++++------- e2e-tests/mysql-ssh/Dockerfile | 1 + workflow-templates/run-tests.yaml | 13 ++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index c7a97c599..d40dfa4fc 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -9,29 +9,28 @@ name: Run tests - develop - feature/** jobs: - build: + build-docker-ssh: runs-on: ubuntu-latest steps: - name: Checkout source uses: actions/checkout@v3 - name: Detect changed files - uses: tj-actions/changed-files@v34 + uses: tj-actions/changed-files@v45 with: - files: | - e2e-tests/mysql-ssh/Dockerfile + files: e2e-tests/mysql-ssh/Dockerfile - name: Build mysql-ssh image - if: '${{ steps.filecheck.outputs.any_changed == ''true'' }}' + if: steps.changed-files-specific.outputs.any_changed == 'true' run: | docker build -t dbgate/mysql-ssh:latest e2e-tests/mysql-ssh - name: Log in to GHCR - if: '${{ steps.filecheck.outputs.any_changed == ''true'' }}' + if: steps.changed-files-specific.outputs.any_changed == 'true' uses: docker/login-action@v2 with: registry: ghcr.io username: '${{ github.actor }}' password: '${{ secrets.GITHUB_TOKEN }}' - name: Push image to GHCR - if: '${{ steps.filecheck.outputs.any_changed == ''true'' }}' + if: steps.changed-files-specific.outputs.any_changed == 'true' run: | docker tag dbgate/mysql-ssh:latest ghcr.io/dbgate/mysql-ssh:latest docker push ghcr.io/dbgate/mysql-ssh:latest diff --git a/e2e-tests/mysql-ssh/Dockerfile b/e2e-tests/mysql-ssh/Dockerfile index 06baa58a3..b62bae980 100644 --- a/e2e-tests/mysql-ssh/Dockerfile +++ b/e2e-tests/mysql-ssh/Dockerfile @@ -17,6 +17,7 @@ RUN service mysql start && \ EXPOSE 22 COPY start.sh /start.sh + RUN chmod +x /start.sh CMD ["/start.sh"] diff --git a/workflow-templates/run-tests.yaml b/workflow-templates/run-tests.yaml index a7264e5e8..3e442bfe5 100644 --- a/workflow-templates/run-tests.yaml +++ b/workflow-templates/run-tests.yaml @@ -8,25 +8,24 @@ on: - 'feature/**' jobs: - build: + build-docker-ssh: runs-on: ubuntu-latest steps: - name: Checkout source uses: actions/checkout@v3 - name: Detect changed files - uses: tj-actions/changed-files@v34 + uses: tj-actions/changed-files@v45 with: - files: | - e2e-tests/mysql-ssh/Dockerfile + files: e2e-tests/mysql-ssh/Dockerfile - name: Build mysql-ssh image - if: ${{ steps.filecheck.outputs.any_changed == 'true' }} + if: steps.changed-files-specific.outputs.any_changed == 'true' run: | docker build -t dbgate/mysql-ssh:latest e2e-tests/mysql-ssh - name: Log in to GHCR - if: ${{ steps.filecheck.outputs.any_changed == 'true' }} + if: steps.changed-files-specific.outputs.any_changed == 'true' uses: docker/login-action@v2 with: registry: ghcr.io @@ -34,7 +33,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Push image to GHCR - if: ${{ steps.filecheck.outputs.any_changed == 'true' }} + if: steps.changed-files-specific.outputs.any_changed == 'true' run: | docker tag dbgate/mysql-ssh:latest ghcr.io/dbgate/mysql-ssh:latest docker push ghcr.io/dbgate/mysql-ssh:latest