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

Commit fb6f926

Browse files
committed
Update CI.
1 parent 65c2af3 commit fb6f926

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

.github/workflows/acceptance.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ jobs:
111111
- "pg-test"
112112
name: Google Container
113113
runs-on: ubuntu-latest
114-
environment:
115-
name: acceptance
116114
steps:
117115
- uses: actions/checkout@v2
118116
with:
@@ -126,7 +124,7 @@ jobs:
126124
with:
127125
registry: us-docker.pkg.dev
128126
username: _json_key
129-
password: ${{ secrets.GAR_JSON_KEY }}
127+
password: ${{ secrets.ACCEPTANCE_GAR_JSON_KEY }}
130128
- name: Container Timestamp
131129
id: timestamp
132130
run: echo "::set-output name=build_time::$(date -u +"%Y-%m-%dT%H:%M:%SZ")"

.gitlab-ci.yml

+4-21
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22
# exception for staging branches that bors creates.
33
workflow:
44
rules:
5-
- if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "staging" || $CI_COMMIT_BRANCH == "trying" || $CI_COMMIT_BRANCH == "dog" || $CI_COMMIT_BRANCH == "acceptance"'
6-
when: never
7-
- if: '$CI_COMMIT_BRANCH == "staging" || $CI_COMMIT_BRANCH == "trying"'
8-
when: never
9-
- if: '$CI_COMMIT_BRANCH =~ /(.tmp)/'
10-
when: never
5+
- if: '$CI_COMMIT_BRANCH == "main"'
6+
when: always
117
- if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
128
when: never
139
- if: $CI_COMMIT_TAG
1410
when: always
15-
# - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != "main"'
16-
# when: never
11+
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != "main"'
12+
when: never
1713

1814
stages:
1915
- Release
@@ -31,19 +27,6 @@ variables:
3127
GO111MODULE: 'on'
3228
GOFLAGS: '-mod=vendor'
3329

34-
Release Testing:
35-
only:
36-
refs:
37-
- tags
38-
allow_failure: true
39-
needs: [ ]
40-
stage: Release
41-
image: containers.monetr.dev/ubuntu:20.04
42-
tags:
43-
- k8s:shared
44-
script:
45-
- git --no-pager log --oneline $(git describe --tags --abbrev=0 @^)..@
46-
4730
Go Dependencies:
4831
needs: [ ]
4932
stage: Dependencies

0 commit comments

Comments
 (0)