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

Commit

Permalink
update .nancy-ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
Berk Dehrioglu committed Apr 29, 2024
1 parent 67bd2eb commit 46d82ba
Show file tree
Hide file tree
Showing 9 changed files with 147 additions and 152 deletions.
108 changes: 5 additions & 103 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
# TODO the workflow is unnecessary complicated due to some deficiencies in our
# deployment pipeline as of time of writing. Therefore the push to Aliyun is
# kind of optional in pull requests so that it does not block the push to the
# app catalog. This is to have faster iterations when working on a daily basis.
# Nevertheless we want the image push to Aliyun to be finished before we want to
# push to the app catalog in case we merge to master or push a tag, which
# indicates a new release. This is to have a more reliable pipeline, with the
# caveat that it takes longer and sometimes even breaks. Once the situation got
# improved we can simplify the circle config again as modified in the pull
# request linked below.
#
# https://github.com/giantswarm/aws-operator/pull/2347
#
version: 2.1

orbs:
architect: giantswarm/architect@4.31.0
architect: giantswarm/architect@5.1.1

workflows:
build:
Expand All @@ -27,108 +14,23 @@ workflows:
tags:
only: /^v.*/

# Ensure that for every commit (all branches), and for every new release tag,
# an image is pushed to Quay.
- architect/push-to-docker:
- architect/push-to-registries:
context: architect
name: push-to-quay
image: "quay.io/giantswarm/aws-operator"
username_envar: "QUAY_USERNAME"
password_envar: "QUAY_PASSWORD"
name: push-to-registries
requires:
- go-build
filters:
tags:
only: /^v.*/

- architect/push-to-docker:
context: architect
name: push-to-docker
image: "docker.io/giantswarm/aws-operator"
username_envar: "DOCKER_USERNAME"
password_envar: "DOCKER_PASSWORD"
requires:
- go-build
# Needed to trigger job also on git tag.
filters:
tags:
only: /^v.*/

# Ensure that for every commit to master, and for every new release tag,
# an image gets pushed to the Aliyun registry.
- architect/push-to-docker:
name: push-to-aliyun
image: "giantswarm-registry.cn-shanghai.cr.aliyuncs.com/giantswarm/aws-operator"
username_envar: "ALIYUN_USERNAME"
password_envar: "ALIYUN_PASSWORD"
context: architect
requires:
- go-build
filters:
branches:
only: master
tags:
only: /^v.*/

# Allow that for every commit (to a branch other than master),
# and for every new tag that is not a release tag,
# an image _can_ get pushed to the Aliyun registry
# if manually approved.
- hold-push-to-aliyun-pr:
type: approval
context: architect
requires:
- go-build
filters:
branches:
ignore: master
tags:
ignore: /^v.*/
- architect/push-to-docker:
name: push-to-aliyun-pr
image: "giantswarm-registry.cn-shanghai.cr.aliyuncs.com/giantswarm/aws-operator"
username_envar: "ALIYUN_USERNAME"
password_envar: "ALIYUN_PASSWORD"
context: architect
requires:
- hold-push-to-aliyun-pr
filters:
branches:
ignore: master
tags:
ignore: /.*/

# Ensure that for every commit to master and for every
# release tag, there is an app version in the catalog.
- architect/push-to-app-catalog:
name: push-to-app-catalog-master
name: push-to-app-catalog
app_catalog: "control-plane-catalog"
app_catalog_test: "control-plane-test-catalog"
chart: "aws-operator"
context: architect
requires:
- push-to-aliyun
- push-to-quay
- push-to-docker
- push-to-registries
filters:
branches:
only: master
tags:
only: /^v.*/

# Ensure that for every commit (branch other than master)
# there is an app version in the test catalog.
# Note: Making this app usable in china needs manual approval
# of the 'hold-push-to-aliyun-pr' job.
- architect/push-to-app-catalog:
name: push-to-app-catalog-pr
app_catalog: "control-plane-catalog"
app_catalog_test: "control-plane-test-catalog"
chart: "aws-operator"
context: architect
requires:
- push-to-quay
- push-to-docker
filters:
branches:
ignore: master
6 changes: 3 additions & 3 deletions .github/workflows/zz_generated.add-team-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
-O artifacts/users.yaml \
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/user-mapping.yaml
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: users
path: artifacts/users.yaml
Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
needs: build_user_list
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
id: download-users
with:
name: users
Expand All @@ -45,7 +45,7 @@ jobs:
done
echo "EOF" >> $GITHUB_ENV
- name: Apply label to issue
if: ${{ env.LABEL != '' }}
if: ${{ env.LABEL != '' && env.LABEL != 'null' && env.LABEL != null }}
uses: actions-ecosystem/action-add-labels@v1
with:
github_token: ${{ secrets.ISSUE_AUTOMATION }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/zz_generated.add-to-project-board.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
-O artifacts/users.yaml \
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/user-mapping.yaml
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: users
path: artifacts/users.yaml
Expand All @@ -30,7 +30,7 @@ jobs:
-O artifacts/labels.yaml \
https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/label-mapping.yaml
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: labels
path: artifacts/labels.yaml
Expand All @@ -42,7 +42,7 @@ jobs:
needs: build_user_list
if: github.event.action == 'assigned'
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
id: download-users
with:
name: users
Expand All @@ -56,7 +56,7 @@ jobs:
echo "BOARD=${BOARD}" >> $GITHUB_ENV
- name: Add issue to personal board
if: ${{ env.BOARD != 'null' && env.BOARD != '' }}
if: ${{ env.BOARD != 'null' && env.BOARD != '' && env.BOARD != null }}
uses: actions/add-to-project@main
with:
project-url: ${{ env.BOARD }}
Expand All @@ -68,7 +68,7 @@ jobs:
needs: build_user_list
if: github.event.action == 'labeled'
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
id: download-labels
with:
name: labels
Expand All @@ -82,7 +82,7 @@ jobs:
echo "BOARD=${BOARD}" >> $GITHUB_ENV
- name: Add issue to team board
if: ${{ env.BOARD != 'null' && env.BOARD != '' }}
if: ${{ env.BOARD != 'null' && env.BOARD != '' && env.BOARD != null }}
uses: actions/add-to-project@main
with:
project-url: ${{ env.BOARD }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zz_generated.check_values_schema.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.6.0
# devctl@6.23.3
#
name: 'Values and schema'
on:
Expand All @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
fetch-depth: 0

Expand Down
Loading

0 comments on commit 46d82ba

Please sign in to comment.