Skip to content
This repository has been archived by the owner on Oct 31, 2021. It is now read-only.

Commit

Permalink
Update CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
elliotcourant committed Sep 30, 2021
1 parent 65c2af3 commit fb6f926
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 24 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/acceptance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ jobs:
- "pg-test"
name: Google Container
runs-on: ubuntu-latest
environment:
name: acceptance
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -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")"
Expand Down
25 changes: 4 additions & 21 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit fb6f926

Please sign in to comment.