diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52d3896e6..7433859bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ jobs: verify: # Only run if it's a push event or if it's a PR from this repository, and it is not dependabot. if: | + false && github.actor != 'dependabot[bot]' && (github.event_name == 'push' || github.event_name == 'release' || @@ -86,19 +87,11 @@ jobs: github.event_name == 'push' || github.event_name == 'release' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) - needs: [verify] + # needs: [verify] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.4.0 - - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v1 - - - uses: docker/login-action@v1 - with: - username: qmcgaw - password: ${{ secrets.DOCKERHUB_PASSWORD }} - # extract metadata (tags, labels) for Docker # https://github.com/docker/metadata-action - name: Extract Docker metadata @@ -112,11 +105,20 @@ jobs: qmcgaw/private-internet-access tags: | type=ref,event=branch,enable=${{ github.ref != format('refs/heads/{0}', github.event.repository.default_branch) }} + type=ref,event=pr type=semver,pattern=v{{major}}.{{minor}}.{{patch}} type=semver,pattern=v{{major}}.{{minor}} type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} + - uses: docker/setup-qemu-action@v1 + - uses: docker/setup-buildx-action@v1 + + - uses: docker/login-action@v1 + with: + username: qmcgaw + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Short commit id: shortcommit run: echo "::set-output name=value::$(git rev-parse --short HEAD)"