From a048911a605c5a0184359c4f96b0dbb5007fe893 Mon Sep 17 00:00:00 2001 From: dnitsch Date: Tue, 24 Jan 2023 13:30:18 +0000 Subject: [PATCH 1/3] fix: ci --- .github/workflows/build.yml | 2 -- .github/workflows/pr.yml | 33 +++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 2 -- README.md | 2 +- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/pr.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5daaca..7364659 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,6 @@ name: CI on: push: branches: [ master ] - pull_request: - branches: [ master ] jobs: build: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 0000000..2b85ed6 --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,33 @@ +name: PR + +on: + pull_request: + branches: [ master, main ] + +jobs: + build: + runs-on: ubuntu-latest + container: + image: golang:1.19-bullseye + env: + FOO: Bar + REVISION: $GITHUB_SHA + # ports: + # - 80 + # volumes: + # - my_docker_volume:/volume_mount + # options: --cpus 1 + steps: + - uses: actions/checkout@v3 + - name: install deps + run: | + apt update && apt install jq -y + make REVISION=$GITHUB_SHA install + - name: make test + run: | + make REVISION=$GITHUB_SHA test + - name: Publish Junit style Test Report + uses: mikepenz/action-junit-report@v3 + if: always() # always run even if the previous step fails + with: + report_paths: '**/report-junit.xml' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04cd21a..c92e65f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,6 @@ name: release on: - push: - branches: [ master ] workflow_run: workflows: ['CI'] # runs after CI workflow types: diff --git a/README.md b/README.md index 3eae032..9deb3e6 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Currently supported variable and secrets implementations: - [GCP Secrets](https://cloud.google.com/secret-manager) - [Hashicorp Vault](https://developer.hashicorp.com/vault/docs/secrets/kv) - using the V2 endpoint - - see + - see [special consideration hashivault](#special-consideration-for-hashicorpvault) The main driver is to use component level configuration objects, if stored in a `"namespaced"` manner e.g. in AWS ParamStore as `/nonprod/component-service-a/configVar`, however this is not a requirement and the param name can be whatever. Though whilst using some sort of a organised manner it will be more straight forward to allow other services to consume certain secrets/params based on resource/access policies. From 336880ae119ac1f5c4295ba913af7b8d8e378e29 Mon Sep 17 00:00:00 2001 From: dnitsch Date: Tue, 24 Jan 2023 13:30:59 +0000 Subject: [PATCH 2/3] fix: change version - pre test --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8dd21a6..af34e91 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ OWNER := dnitsch NAME := configmanager -GIT_TAG := "1.17.0-pre" +GIT_TAG := "1.17.1-pre" VERSION := "v$(GIT_TAG)" # VERSION := "$(shell git describe --tags --abbrev=0)" REVISION := $(shell git rev-parse --short HEAD) From 98a4bbb0fc49bdb50742a27cc38834867b62e495 Mon Sep 17 00:00:00 2001 From: dnitsch Date: Tue, 24 Jan 2023 13:32:56 +0000 Subject: [PATCH 3/3] fix: change name --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2b85ed6..1c4b333 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -5,7 +5,7 @@ on: branches: [ master, main ] jobs: - build: + pr: runs-on: ubuntu-latest container: image: golang:1.19-bullseye