diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4317f7b..b41d912 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -84,7 +84,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 # - name: Login to DockerHub # uses: docker/login-action@v1 @@ -93,7 +93,7 @@ jobs: # password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push Docker image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index dfc316f..58db9da 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -5,49 +5,18 @@ on: branches: [main] jobs: - frontend-check: + docker-build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: "20" - - - name: Enable Corepack - run: corepack enable - - - name: Install Yarn 2 - run: yarn set version berry - working-directory: ./frontend - - - name: Install dependencies - run: yarn install - working-directory: ./frontend - - - name: Run linter - run: yarn run lint - working-directory: ./frontend - - - name: Build - run: yarn run build - working-directory: ./frontend - - backend-check: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 - - name: Setup PDM - uses: pdm-project/setup-pdm@v4 - - - name: Install dependencies - working-directory: ./backend - run: pdm install --dev - - - name: Run linter - working-directory: ./backend - run: pdm run ruff . \ No newline at end of file + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile + push: false \ No newline at end of file