ci: remove standalone commitlint

ferrarimarco · Oct 19, 2024 · cf6f2be · cf6f2be
1 parent 21a0da9
commit cf6f2be
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 1,013 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -53,7 +53,7 @@ updates:
  - /config/ansible/roles/ferrarimarco_home_lab_node/files/config/dependency-updates-helper
  - /config/ansible/roles/ferrarimarco_home_lab_node/files/config/restic
  - /docker/ansible
- - /docker/release-please-commitlint
+ - /docker/ci-cd-tools
  commit-message:
  prefix: "deps"
  package-ecosystem: "docker"
@@ -80,7 +80,7 @@ updates:
  - node
  - python
  - directories:
- - /docker/release-please-commitlint
+ - /docker/ci-cd-tools
  commit-message:
  prefix: "deps"
  package-ecosystem: "npm"

diff --git a/.github/renovate.json b/.github/renovate.json
@@ -21,7 +21,7 @@
  "matchFileNames": [
  "config/pre-commit/**",
  ".github/**",
- "docker/release-please-commitlint/**",
+ "docker/ci-cd-tools/**",
  "scripts/run-renovate.sh"
  ],
  "groupName": "ci"

diff --git a/.github/workflows/build-container-images.yaml b/.github/workflows/build-container-images.yaml
@@ -101,4 +101,4 @@ jobs:
  context-directory: config/ansible/roles/ferrarimarco_home_lab_node/files/config/restic
  - name: cd-container
  build-contexts: null
- context-directory: docker/release-please-commitlint
+ context-directory: docker/ci-cd-tools
diff --git a/.github/workflows/lint-commit.yaml b/.github/workflows/lint-commit.yaml
@@ -35,40 +35,3 @@ jobs:
  else
  echo "This pull request contains ${commit_count} commit."
  fi
-
- - name: Set commit metadata
- run: |
- SET_INTERVAL_VALUES="true"
- if [[ ${{ github.event_name }} == 'push' ]] || [[ ${{ github.event_name }} == 'merge_group' ]]; then
- echo "Using default commit metadata"
- SET_INTERVAL_VALUES="false"
- elif [[ ${{ github.event_name }} == 'pull_request' ]]; then
- FROM_INTERVAL_COMMITLINT=${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }}
- TO_INTERVAL_COMMITLINT=${{ github.event.pull_request.head.sha }}
- else
- echo "[ERROR] Event not supported when setting commit metadata"
- exit 1
- fi
-
- if [ "${SET_INTERVAL_VALUES}" == "true" ]; then
- if [ -z "${FROM_INTERVAL_COMMITLINT}" ]; then
- echo "[ERROR] FROM_INTERVAL_COMMITLINT is empty"
- exit 1
- fi
-
- if [ -z "${TO_INTERVAL_COMMITLINT}" ]; then
- echo "[ERROR] TO_INTERVAL_COMMITLINT is empty"
- exit 1
- fi
-
- {
- echo "FROM_INTERVAL_COMMITLINT=${FROM_INTERVAL_COMMITLINT}"
- echo "TO_INTERVAL_COMMITLINT=${TO_INTERVAL_COMMITLINT}"
- } >> "${GITHUB_ENV}"
- else
- echo "Skip updating GITHUB_ENV. SET_INTERVAL_VALUES: ${SET_INTERVAL_VALUES}"
- fi
-
- - name: Validate commits
- run: |
- scripts/lint-commits.sh
diff --git a/config/lint/.checkov.baseline b/config/lint/.checkov.baseline
@@ -25,10 +25,10 @@
  ]
  },
  {
- "file": "/docker/release-please-commitlint/Dockerfile",
+ "file": "/docker/ci-cd-tools/Dockerfile",
  "findings": [
  {
- "resource": "/docker/release-please-commitlint/Dockerfile.",
+ "resource": "/docker/ci-cd-tools/Dockerfile.",
  "check_ids": [
  "CKV_DOCKER_2"
  ]

diff --git a/docker/release-please-commitlint/Dockerfile → docker/ci-cd-tools/Dockerfile b/docker/release-please-commitlint/Dockerfile → docker/ci-cd-tools/Dockerfile
@@ -13,6 +13,7 @@ WORKDIR "${APP_DIR}"
 COPY package.json package-lock.json ./
 
 RUN npm ci \
+ && npm audit \
  && rm -rf ~/.npm
 
 ENV NODE_PATH="${APP_DIR}/node_modules"