From 6c78aad17996f87f15c97ce5f43be01d9be29400 Mon Sep 17 00:00:00 2001 From: roicohen <213414225+roicohen326@users.noreply.github.com> Date: Sun, 15 Feb 2026 15:35:34 +0200 Subject: [PATCH 1/5] chore: add dependabot configuration and update CI workflows --- .github/dependabot.yaml | 7 +++++ .github/workflows/build_and_push.yaml | 40 +++++++++++++++++---------- .github/workflows/pull_request.yaml | 22 ++++++++++----- .gitignore | 3 ++ helm/Chart.lock | 6 ---- helm/Chart.yaml | 2 ++ 6 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 .github/dependabot.yaml delete mode 100644 helm/Chart.lock diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..be6dc35 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,7 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + target-branch: master diff --git a/.github/workflows/build_and_push.yaml b/.github/workflows/build_and_push.yaml index 4d1f865..b70e1a9 100644 --- a/.github/workflows/build_and_push.yaml +++ b/.github/workflows/build_and_push.yaml @@ -5,22 +5,34 @@ on: tags: - "v*" - workflow_dispatch: - inputs: - version: - description: "Version to tag the helm chart with" - required: true - type: string -env: - HELM_EXPERIMENTAL_OCI: 1 - permissions: contents: write pull-requests: write jobs: - build_and_push_helm: - uses: MapColonies/shared-workflows/.github/workflows/build-and-push-helm.yaml@v5 - secrets: inherit - with: - scope: raster + build-and-push: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + + - name: Login to ACR + uses: MapColonies/artifactory-login@v1.0.0 + with: + username: ${{ secrets.ACR_PUSH_USER }} + password: ${{ secrets.ACR_PUSH_TOKEN }} + registry: acrarolibotnonprod.azurecr.io + + - name: Build and Push Helm Chart + uses: MapColonies/build-and-push-helm@v1.0.1 + with: + domain: raster + project: ${{ github.repository }} + tag: ${{ github.ref_name }} + registry_url: acrarolibotnonprod.azurecr.io + + - name: Update Artifacts File + uses: MapColonies/update-artifacts-file@v1.1.1 + with: + domain: raster + project: ${{ github.repository }} + tag: ${{ github.ref_name }} diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 5eec618..59fccf2 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -3,12 +3,20 @@ name: CI on: [pull_request] jobs: + helm-lint: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + - uses: MapColonies/helm-lint@v1 + with: + charts_dir: ./helm + security: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@master - - name: Run Snyk to check for vulnerabilities - uses: snyk/actions/node@master - continue-on-error: true - env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + - uses: actions/checkout@v4 + - name: Run Snyk to check for vulnerabilities + uses: snyk/actions/node@master + continue-on-error: true + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} diff --git a/.gitignore b/.gitignore index 8b6ae01..fb0d949 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,6 @@ dist .pnp.* local.yaml + +# helm +Chart.lock diff --git a/helm/Chart.lock b/helm/Chart.lock deleted file mode 100644 index 545de05..0000000 --- a/helm/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: nginx - repository: oci://acrarolibotnonprod.azurecr.io/helm - version: 1.3.0 -digest: sha256:1b5c95baae34899175d5b8decc47f1609a885c1b6cda49dc6e16e86f0bab990f -generated: "2024-05-27T14:04:45.062949843+03:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 332e972..2340c3f 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -4,6 +4,8 @@ description: A Helm chart for files-server type: application version: 2.1.1 appVersion: 2.1.1 +annotations: + domain: raster dependencies: - name: nginx version: 1.3.0 From e8d39ab236855e5c4d5139e6dfc2e3109ed6fe91 Mon Sep 17 00:00:00 2001 From: roicohen <213414225+roicohen326@users.noreply.github.com> Date: Sun, 15 Feb 2026 15:53:26 +0200 Subject: [PATCH 2/5] fix: use standard helm lint command instead of non exist mpacolonies lint action --- .github/workflows/pull_request.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 59fccf2..f6d8887 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -7,9 +7,8 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - uses: MapColonies/helm-lint@v1 - with: - charts_dir: ./helm + - uses: azure/setup-helm@v4 + - run: helm lint ./helm security: runs-on: ubuntu-24.04 From 42c78014b71a5774194e8f574787ddd7bef4a100 Mon Sep 17 00:00:00 2001 From: roicohen <213414225+roicohen326@users.noreply.github.com> Date: Mon, 16 Feb 2026 10:15:06 +0200 Subject: [PATCH 3/5] chore: removed unnecessary annotations --- helm/Chart.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 2340c3f..332e972 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -4,8 +4,6 @@ description: A Helm chart for files-server type: application version: 2.1.1 appVersion: 2.1.1 -annotations: - domain: raster dependencies: - name: nginx version: 1.3.0 From 357dd8cb69962e68c92f39cbfc4ad66600424b00 Mon Sep 17 00:00:00 2001 From: roicohen <213414225+roicohen326@users.noreply.github.com> Date: Mon, 16 Feb 2026 10:18:11 +0200 Subject: [PATCH 4/5] chore: renamed build and push file --- .github/workflows/{build_and_push.yaml => build-and-push.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build_and_push.yaml => build-and-push.yaml} (100%) diff --git a/.github/workflows/build_and_push.yaml b/.github/workflows/build-and-push.yaml similarity index 100% rename from .github/workflows/build_and_push.yaml rename to .github/workflows/build-and-push.yaml From b6f00eaba3bdb0595ea0744414906d8e964c0011 Mon Sep 17 00:00:00 2001 From: roicohen <213414225+roicohen326@users.noreply.github.com> Date: Mon, 16 Feb 2026 10:48:30 +0200 Subject: [PATCH 5/5] feat: add release please compatability --- .github/workflows/release-please.yaml | 19 +++++++++++++++++++ .release-please-manifest.json | 3 +++ release-please-config.json | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 .github/workflows/release-please.yaml create mode 100644 .release-please-manifest.json create mode 100644 release-please-config.json diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml new file mode 100644 index 0000000..bc2af7c --- /dev/null +++ b/.github/workflows/release-please.yaml @@ -0,0 +1,19 @@ +on: + push: + branches: + - master + workflow_dispatch: + +permissions: + contents: write + pull-requests: write + +name: release-please + +jobs: + release-please: + runs-on: ubuntu-latest + steps: + - uses: googleapis/release-please-action@v4 + with: + token: ${{ secrets.GH_PAT }} diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000..48fbed9 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "2.1.1" +} diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..d1ec716 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "release-type": "simple", + "include-component-in-tag": false, + "packages": { + ".": { + "extra-files": [ + { + "type": "yaml", + "path": "helm/Chart.yaml", + "jsonpath": "$.version" + }, + { + "type": "yaml", + "path": "helm/Chart.yaml", + "jsonpath": "$.appVersion" + } + ] + } + } +}