diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index b51f417..243fb5d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -2,33 +2,34 @@ name: Build and Run Tests on: pull_request: - branches: [ main ] + branches: + - main jobs: build: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Set Xcode - run: xcversion select 14.2 + - name: Set Xcode + run: xcversion select 15.2 - - name: Build - run: swift build -v + - name: Build + run: swift build -v test: - runs-on: macos-latest - steps: - - uses: actions/checkout@v3 + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 - - name: Set Xcode - run: xcversion select 14.2 + - name: Set Xcode + run: xcversion select 15.2 - - name: Run tests - run: swift test -v --parallel --xunit-output test.xml + - name: Run tests + run: swift test -v --parallel --xunit-output test.xml - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action/composite@v1 - if: always() - with: - files: "test.xml" + - name: Publish Unit Test Results + uses: EnricoMi/publish-unit-test-result-action/composite@v2 + if: always() + with: + files: "test.xml" diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml index a68776e..c5891f2 100644 --- a/.github/workflows/build_docker_image.yml +++ b/.github/workflows/build_docker_image.yml @@ -3,32 +3,30 @@ name: Build Docker Image on: workflow_dispatch: push: - branches: - - main + branches: + - main jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Quay login - run: docker login -u="$QUAY_USERNAME" -p="$QUAY_TOKEN" quay.io - env: - QUAY_TOKEN: ${{ secrets.quay_token }} - QUAY_USERNAME: ${{ secrets.quay_username }} - - - name: Build and push - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: quay.io/lunarway/swaggerswift:latest + - uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Quay login + run: docker login -u="$QUAY_USERNAME" -p="$QUAY_TOKEN" quay.io + env: + QUAY_TOKEN: ${{ secrets.quay_token }} + QUAY_USERNAME: ${{ secrets.quay_username }} + + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: quay.io/lunarway/swaggerswift:latest