From 6c5683a7f328bc8818c316a7160c3246b0cbaf7b Mon Sep 17 00:00:00 2001 From: cmppoon Date: Mon, 9 Oct 2023 23:58:57 +0800 Subject: [PATCH 1/3] fix broken contributing guide (#2939) Signed-off-by: Chaiyapruek Muangsiri --- CONTRIBUTING.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 377fa70bd..29dbcac9b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,7 +95,7 @@ Unless the issue specifically mentions a branch, please create your feature bran For example: -``` +```bash # Make sure you have the most recent changes to main git checkout main git pull @@ -177,7 +177,7 @@ have the right to contribute the code you are submitting to the project. You sign-off by adding the following to your commit messages: -``` +```bash Author: Your Name Date: Thu Feb 2 11:41:15 2018 -0800 @@ -191,12 +191,16 @@ be rejected by the automated DCO check. Git has a `-s` command line option to do this automatically: - git commit -s -m 'This is my commit message' +``` +git commit -s -m 'This is my commit message' +``` If you forgot to do this and have not yet pushed your changes to the remote repository, you can amend your commit with the sign-off by running - git commit --amend -s +``` +git commit --amend -s +``` ## The life of a pull request From b63338bfeb04d1260d43cb0fcde4033cdb90e36e Mon Sep 17 00:00:00 2001 From: schristoff <28318173+schristoff@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:49:54 -0500 Subject: [PATCH 2/3] (docs) expand more on the "default" field for parameters (#2927) * update document to expand on param defaults Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com> * make docs better Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com> --------- Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com> --- docs/content/wiring.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/content/wiring.md b/docs/content/wiring.md index 65e514614..f8e50c0ca 100644 --- a/docs/content/wiring.md +++ b/docs/content/wiring.md @@ -51,6 +51,15 @@ You can also provide any other attributes, as specified by the CNAB [parameters] default: "wordpress" ``` +If you decide to use the default parameter field, you must set it as the empty value. +However, it must be passed in as an empty type. For example, for an empty string, pass in `""` as the default, or for an object use `{}`: + +```yaml +- name: command + type: object + default: {} +``` + ### File Parameters Porter also enables the use of file parameters in a bundle. From da365690931c752a78b9d86588c1ca88586e4a51 Mon Sep 17 00:00:00 2001 From: KallyDev Date: Wed, 18 Oct 2023 02:26:04 +0800 Subject: [PATCH 3/3] Check the licenses of dependencies (#2943) * Check the licenses of dependencies Signed-off-by: KallyDev --------- Signed-off-by: KallyDev --- .github/workflows/check-licenses.yaml | 26 ++++++++++++++++++++++++++ CONTRIBUTORS.md | 1 + 2 files changed, 27 insertions(+) create mode 100644 .github/workflows/check-licenses.yaml diff --git a/.github/workflows/check-licenses.yaml b/.github/workflows/check-licenses.yaml new file mode 100644 index 000000000..99576c64f --- /dev/null +++ b/.github/workflows/check-licenses.yaml @@ -0,0 +1,26 @@ +name: Check licenses +on: + push: + pull_request: + branches: + - main + +jobs: + check: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version-file: go.mod + cache: true + - name: Install go-licenses + run: go install github.com/google/go-licenses@v1.6.0 + - name: Check licenses + run: | + go-licenses check ./... \ + --ignore github.com/xi2/xz,golang.org/x/sys/unix # https://github.com/xi2/xz/blob/master/LICENSE diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4eac04346..73444ce15 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -91,3 +91,4 @@ and we will add you. **All** contributors belong here. 💯 - [Sumit Kumar Soni](https://github.com/zelfroster) - [Chaiyapruek Muangsiri](https://github.com/cmppoon) - [Xin Fu](https://github.com/imfing) +- [KallyDev](https://github.com/kallydev)