From 06450eddbf47bea707654ff74e84b46f7bbad8f9 Mon Sep 17 00:00:00 2001 From: lommi Date: Thu, 11 Jul 2024 10:00:37 +0000 Subject: [PATCH 1/2] fix: retag --- scripts/ci/00_prepare-base-tags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/00_prepare-base-tags.sh b/scripts/ci/00_prepare-base-tags.sh index bfc83b8a63bd..0646576795c9 100755 --- a/scripts/ci/00_prepare-base-tags.sh +++ b/scripts/ci/00_prepare-base-tags.sh @@ -24,7 +24,7 @@ if [[ "$BUILD_REF" != "$LAST_GOOD_BUILD_SHA" ]]; then git log -1 "$BUILD_REF" fi LAST_GOOD_BUILD_DOCKER_BRANCH_TAG=$(echo "${LAST_GOOD_BUILD_BRANCH}" | tr "/." "-" ) -export LAST_GOOD_BUILD_DOCKER_TAG=${LAST_GOOD_BUILD_DOCKER_BRANCH_TAG:0:45}_${LAST_GOOD_BUILD_SHA}_${LAST_GOOD_BUILD_RUN_NUMBER} +export LAST_GOOD_BUILD_DOCKER_TAG=${LAST_GOOD_BUILD_DOCKER_BRANCH_TAG:0:45}_${LAST_GOOD_BUILD_SHA:0:10}_${LAST_GOOD_BUILD_RUN_NUMBER} if [[ "$BUILD_REF" == "null" || "$BUILD_REF" == "" ]]; then curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"Change detection failed for $HTML_URL\"}" "$ISSUE_REPORTING_SLACK_WEBHOOK_URL" exit 1 From 208f23d4bd5684c493e5b1d20aa22b3fd851e2e0 Mon Sep 17 00:00:00 2001 From: lommi Date: Thu, 11 Jul 2024 10:05:13 +0000 Subject: [PATCH 2/2] fix: remove --- .github/workflows/datadog-analysis.yml | 44 -------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .github/workflows/datadog-analysis.yml diff --git a/.github/workflows/datadog-analysis.yml b/.github/workflows/datadog-analysis.yml deleted file mode 100644 index c02d93f7e3c0..000000000000 --- a/.github/workflows/datadog-analysis.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Datadog Static Analysis -on: - push: - branches: - - 'main' - - 'release/**' - - 'pre-release/**' - paths-ignore: - - '**/*.md' - workflow_dispatch: - create: - pull_request: - types: - - opened - - synchronize - -jobs: - static-analysis: - runs-on: ec2-runners - container: - image: public.ecr.aws/m3u4c4h9/island-is/actions-runner-public:latest - name: Datadog Static Analyzer - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Check code meets quality and security standards - id: datadog-static-analysis - uses: DataDog/datadog-static-analyzer-github-action@v1 - with: - dd_api_key: ${{ secrets.DD_API_KEY }} - dd_app_key: ${{ secrets.DD_APP_KEY }} - dd_service: islandis - dd_env: ci - dd_site: datadoghq.eu - cpu_count: 2 - - name: Check imported libraries are secure and compliant - id: datadog-software-composition-analysis - uses: DataDog/datadog-sca-github-action@main - with: - dd_api_key: ${{ secrets.DD_API_KEY }} - dd_app_key: ${{ secrets.DD_APP_KEY }} - dd_service: islandis - dd_env: ci - dd_site: datadoghq.eu