diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index d8b27c1..d4e9ed2 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -3,7 +3,7 @@ name: Auto-Merge on: pull_request_review: branches: - - master + - main types: - submitted diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 4665255..dfff14e 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -3,7 +3,7 @@ name: Create Release on: push: branches: - - master + - main jobs: unit: @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v2.1.4 with: - go-version: 1.14 + go-version: 1.15.x - name: Checkout uses: actions/checkout@v2 - name: Run Unit Tests @@ -24,6 +24,10 @@ jobs: runs-on: ubuntu-latest needs: unit steps: + - name: Setup Go + uses: actions/setup-go@v2.1.4 + with: + go-version: 1.15.x - name: Checkout uses: actions/checkout@v2 - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* || true @@ -35,7 +39,7 @@ jobs: token: ${{ github.token }} - name: Tag id: tag - uses: paketo-buildpacks/github-config/actions/tag@main + uses: paketo-buildpacks/github-config/actions/tag/increment-tag@b935ce32a10f97eb94fdad03220dd19c5645a2f0 with: current_version: ${{ steps.reset.outputs.current_version }} - name: Package @@ -43,6 +47,9 @@ jobs: - name: Create Release Notes id: create-release-notes uses: paketo-buildpacks/github-config/actions/release/notes@main + with: + repo: ${{ github.repository }} + token: ${{ secrets.MS_BOT_GITHUB_TOKEN }} - name: Create Release uses: paketo-buildpacks/github-config/actions/release/create@main with: @@ -65,4 +72,4 @@ jobs: "name": "${{ github.event.repository.name }}-${{ steps.tag.outputs.tag }}.cnb", "content_type": "application/gzip" } - ] \ No newline at end of file + ]