diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 55daf10..1c4b655 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -11,13 +11,12 @@ env: APP_NAME: ${{ github.event.repository.name }} APP_ENV: ${{ inputs.environment }} -concurrency: - group: ${{ github.event.repository.name }}-docker-${{ github.ref_name }} - cancel-in-progress: true - jobs: docker: runs-on: self-hosted + concurrency: + group: ${{ github.event.repository.name }}-docker-${{ github.ref_name }} + cancel-in-progress: true steps: - name: Checkout sources uses: actions/checkout@v3 @@ -47,14 +46,10 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Install Helm and Kubernetes CLI - uses: hiberbee/github-action-helm@1.13.0 - with: - helm: version - - name: Build Docker images - uses: hiberbee/github-action-skaffold@1.21.1 + uses: hiberbee/github-action-skaffold@1.22.0 with: command: build + skip-tests: false repository: ${{ secrets.DOCKER_REGISTRY }}/${{ env.APP_NAME }} profile: ${{ env.APP_ENV }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a1b1b76..7a0e590 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: password: ${{ env.DOCKER_PASSWORD }} - name: Build Docker images - uses: hiberbee/github-action-skaffold@1.19.0 + uses: hiberbee/github-action-skaffold@1.22.0 with: command: build skip-tests: false diff --git a/.github/workflows/test-images.yml b/.github/workflows/test-images.yml deleted file mode 100644 index eeb9025..0000000 --- a/.github/workflows/test-images.yml +++ /dev/null @@ -1,38 +0,0 @@ -on: - workflow_call: - inputs: - environment: - required: false - description: Used by Skaffold and Helmfile profiles - type: string - default: staging - -env: - APP_NAME: ${{ github.event.repository.name }} - APP_ENV: ${{ inputs.environment }} - -jobs: - docker: - runs-on: self-hosted - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Login Docker registry - uses: docker/login-action@v1 - with: - registry: ${{ secrets.DOCKER_REGISTRY }}/${{ env.APP_NAME }} - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Pull Docker images - run: | - docker pull ${{ secrets.DOCKER_REGISTRY }}/${{ env.APP_NAME }}/cms:latest - docker pull ${{ secrets.DOCKER_REGISTRY }}/${{ env.APP_NAME }}/website:latest - - - name: Test Docker images - uses: hiberbee/github-action-skaffold@1.21.1 - with: - command: test - images: ${{ secrets.DOCKER_REGISTRY }}/${{ env.APP_NAME }}/cms:latest,${{ secrets.DOCKER_REGISTRY }}/${{ env.APP_NAME }}/website:latest - profile: ${{ env.APP_ENV }} diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..842886f 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,5 +1,15 @@ + + +