diff --git a/.github/workflows/acceptance.yaml b/.github/workflows/acceptance.yaml index a4f3485..acdc5d1 100644 --- a/.github/workflows/acceptance.yaml +++ b/.github/workflows/acceptance.yaml @@ -111,8 +111,6 @@ jobs: - "pg-test" name: Google Container runs-on: ubuntu-latest - environment: - name: acceptance steps: - uses: actions/checkout@v2 with: @@ -126,7 +124,7 @@ jobs: with: registry: us-docker.pkg.dev username: _json_key - password: ${{ secrets.GAR_JSON_KEY }} + password: ${{ secrets.ACCEPTANCE_GAR_JSON_KEY }} - name: Container Timestamp id: timestamp run: echo "::set-output name=build_time::$(date -u +"%Y-%m-%dT%H:%M:%SZ")" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8cea89f..ce3d404 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,18 +2,14 @@ # exception for staging branches that bors creates. workflow: rules: - - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "staging" || $CI_COMMIT_BRANCH == "trying" || $CI_COMMIT_BRANCH == "dog" || $CI_COMMIT_BRANCH == "acceptance"' - when: never - - if: '$CI_COMMIT_BRANCH == "staging" || $CI_COMMIT_BRANCH == "trying"' - when: never - - if: '$CI_COMMIT_BRANCH =~ /(.tmp)/' - when: never + - if: '$CI_COMMIT_BRANCH == "main"' + when: always - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"' when: never - if: $CI_COMMIT_TAG when: always -# - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != "main"' -# when: never + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != "main"' + when: never stages: - Release @@ -31,19 +27,6 @@ variables: GO111MODULE: 'on' GOFLAGS: '-mod=vendor' -Release Testing: - only: - refs: - - tags - allow_failure: true - needs: [ ] - stage: Release - image: containers.monetr.dev/ubuntu:20.04 - tags: - - k8s:shared - script: - - git --no-pager log --oneline $(git describe --tags --abbrev=0 @^)..@ - Go Dependencies: needs: [ ] stage: Dependencies