diff --git a/.github/workflows/master-push.yml b/.github/workflows/main-push.yml similarity index 62% rename from .github/workflows/master-push.yml rename to .github/workflows/main-push.yml index 1d72842..a0f475d 100644 --- a/.github/workflows/master-push.yml +++ b/.github/workflows/main-push.yml @@ -1,8 +1,8 @@ -name: Master Update +name: Main Update on: push: branches: - - master + - main jobs: run-tests: runs-on: ubuntu-latest @@ -16,8 +16,6 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Get time of commit - run: echo "TIME=$(git log -1 --pretty=format:%ct)" >> $GITHUB_ENV - name: Run tests, upload coverage and publish image uses: docker/build-push-action@v3 with: @@ -25,12 +23,6 @@ jobs: file: ./build/Dockerfile builder: ${{ steps.buildx.outputs.name }} push: true - tags: aamdigital/replication-ms:latest + tags: aamdigital/deployer-ms:latest cache-from: type=gha cache-to: type=gha,mode=max - build-args: | - UPLOAD_COVERAGE=${{ true }} - GIT_COMMIT_SHA=${{ github.sha }} - GIT_BRANCH=master - GIT_COMMITTED_AT=${{ env.TIME }} - CC_TEST_REPORTER_ID=${{ secrets.CODE_CLIMATE_ID }} diff --git a/.github/workflows/pull-request-update.yml b/.github/workflows/pull-request-update.yml deleted file mode 100644 index a8f66a0..0000000 --- a/.github/workflows/pull-request-update.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Pipeline -on: pull_request - -jobs: - run-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - name: Get time of commit - run: echo "TIME=$(git log -1 --pretty=format:%ct)" >> $GITHUB_ENV - - name: Build dev image and save it locally - uses: docker/build-push-action@v3 - with: - context: ./ - file: ./build/Dockerfile - builder: ${{ steps.buildx.outputs.name }} - tags: test-image - build-args: | - UPLOAD_COVERAGE=${{ true }} - GIT_COMMIT_SHA=${{ github.event.pull_request.head.sha }} - GIT_BRANCH=${{ github.head_ref }} - GIT_COMMITTED_AT=${{ env.TIME }} - CC_TEST_REPORTER_ID=${{ secrets.CODE_CLIMATE_ID }} - cache-from: type=gha - cache-to: type=gha,mode=max