From 69290f689d020b3e40ed6725a6eaf32c2629774b Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Mon, 15 Jan 2024 22:19:56 +0100 Subject: [PATCH 1/3] bump node version to fix arm build --- Dockerfile | 3 ++- charts/bitwarden-crd-operator/Chart.yaml | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 471edc4..672472e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG PIP_VERSION=23.3.1-r0 ARG GCOMPAT_VERSION=1.1.0-r4 ARG LIBCRYPTO_VERSION=3.1.4-r2 ARG BW_VERSION=2023.7.0 -ARG NODE_VERSION=20.10.0-r1 +ARG NODE_VERSION=20.11.0-r0 COPY requirements.txt /requirements.txt @@ -18,6 +18,7 @@ RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ aarch64|arm64) \ + apk del nodejs-current; \ apk add nodejs=${NODE_VERSION} npm; \ npm install -g @bitwarden/cli@${BW_VERSION}; \ ;; \ diff --git a/charts/bitwarden-crd-operator/Chart.yaml b/charts/bitwarden-crd-operator/Chart.yaml index e841dde..56c011f 100644 --- a/charts/bitwarden-crd-operator/Chart.yaml +++ b/charts/bitwarden-crd-operator/Chart.yaml @@ -4,9 +4,9 @@ description: Deploy the Bitwarden CRD Operator type: application -version: "v0.11.1" +version: "v0.11.2" -appVersion: "0.10.1" +appVersion: "0.10.2" keywords: - operator @@ -101,10 +101,10 @@ annotations: artifacthub.io/operator: "true" artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/changes: | - - kind: fixed - description: "Downgrade node to LTS in order to make bw cli work on arm" - kind: changed - description: "Update bw cli to 2023.7.0 for the same reason" + description: "Update jinja to 3.1.3" + - kind: changed + description: "Update Node on arm to 20.11.0-r0" artifacthub.io/images: | - name: bitwarden-crd-operator - image: ghcr.io/lerentis/bitwarden-crd-operator:0.10.1 + image: ghcr.io/lerentis/bitwarden-crd-operator:0.10.2 From be8f21e9c45e8f9dec5f2ad92ec8a41bbe83ae33 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Mon, 15 Jan 2024 22:20:45 +0100 Subject: [PATCH 2/3] downgrade download-artifact action because of https://github.com/anchore/sbom-action/issues/434 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a57315f..32e23ef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,7 +77,7 @@ jobs: uses: WyriHaximus/github-action-get-previous-tag@v1 - name: Download SBOM from github action - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v3 with: name: ${{ env.ANCHORE_SBOM_ACTION_PRIOR_ARTIFACT }} From 2b75b919b289870efa8bd2d2f6bd6d4f686794d9 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Mon, 15 Jan 2024 22:33:21 +0100 Subject: [PATCH 3/3] add ah lint --- .github/workflows/test-and-lint.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/test-and-lint.yml b/.github/workflows/test-and-lint.yml index 2a00f71..102f6a4 100644 --- a/.github/workflows/test-and-lint.yml +++ b/.github/workflows/test-and-lint.yml @@ -36,6 +36,18 @@ jobs: if: steps.list-changed.outputs.changed == 'true' run: ct lint --target-branch ${{ github.event.repository.default_branch }} + - name: Install ah cli + run: | + export AH_VERSION=1.17.0 + curl -LO https://github.com/artifacthub/hub/releases/download/v${AH_VERSION}/ah_${AH_VERSION}_linux_amd64.tar.gz + tar -xf ah_${AH_VERSION}_linux_amd64.tar.gz + chmod +x ./ah + sudo mv ./ah /usr/bin/ah + rm LICENSE + - name: ah lint + run: | + ah lint + pr-build: runs-on: ubuntu-latest steps: