feat: get ready for release (#18136)

lodmfjord · web-flow · commit af6fa40a4193 · 2025-02-26T11:27:29.000Z
* fix: ok

* fix: ignore

* fix: ok

* fix: get sha

* fix: ok

* fix: ok

* fix: ok

* fix: error

* fix: skip run

* fix: ok

* fix: merge
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
@@ -87,6 +87,9 @@ jobs:
       NX_BASE: ${{ steps.export-sha.outputs.NX_BASE }}
       DEPLOY_FEATURE: ${{ steps.set-outputs.outputs.DEPLOY_FEATURE }}
     runs-on: arc-runners
+    permissions:
+      contents: 'read'
+      actions: 'read'
     steps:
       - name: Set outputs
         id: set-outputs
@@ -97,8 +100,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-
+          fetch-depth: 0  
       - name: Setup yarn
         uses: ./.github/actions/setup-yarn
 
@@ -111,6 +113,7 @@ jobs:
           echo "MAIN_BRANCH=${RAW_REF#refs/heads/}" >> $GITHUB_OUTPUT
           echo "MAIN_BRANCH=${RAW_REF#refs/heads/}"
       - name: Derive appropriate SHAs
+        if: ${{ inputs.run_merge_queue == false }}
         uses: nrwl/nx-set-shas@v4
         with:
           main-branch-name: ${{ steps.get-branch.outputs.MAIN_BRANCH }}
@@ -119,6 +122,23 @@ jobs:
         id: export-sha
         shell: bash
         run: |
+          if [[ "${{ inputs.run_merge_queue }}" == "true" ]]; then
+            # In merge que we always want to use the last 
+            # commit as head - last commit sha is alway succesful
+            # since else it won't get merged!
+            # checkout this PR: https://github.com/nrwl/nx-set-shas/pull/145/files
+            # when this gets merged we can remove this hack!
+            #
+            # If we do not do this we will get the wrong base sha
+            # :(
+            export NX_HEAD=${{ github.sha }}
+            export NX_BASE=$(git rev-parse HEAD^1)
+            echo NX_HEAD="$NX_HEAD" >> "$GITHUB_OUTPUT"
+            echo NX_BASE="$NX_BASE" >> "$GITHUB_OUTPUT"
+            echo HEAD="$NX_HEAD" >> "$GITHUB_ENV"
+            echo BASE="$NX_BASE" >> "$GITHUB_ENV"
+            exit 0
+          fi
           echo NX_HEAD="${{ env.NX_HEAD }}" >> "$GITHUB_OUTPUT"
           echo NX_BASE="${{ env.NX_BASE }}" >> "$GITHUB_OUTPUT"
           # NOTE: we reference BASE and HEAD elsewhere
@@ -137,7 +157,6 @@ jobs:
         id: prepare-merge-queue
         if: ${{ inputs.run_merge_queue == true }}
         run: |
-          yarn --cwd scripts/ci/docker install
           node scripts/ci/docker/generate-tag.mjs
 
       # This is to increase the retention days for our GitHub Actions run events
@@ -147,7 +166,7 @@ jobs:
         uses: actions/upload-artifact@b18b1d32f3f31abcdc29dee3f2484801fe7822f4
 
         # Don't run this step locally
-        if: ${{ !github.event.localrun }}
+        if: ${{ !github.event.localrun && inputs.run_merge_queue == false }}
         with:
           name: pr-event
           path: event.json
diff --git a/.github/workflows/merge-queue.yml b/.github/workflows/merge-queue.yml
@@ -96,7 +96,6 @@ jobs:
         uses: ./.github/actions/setup-yarn
       - name: Set id for matrix
         run: |
-          yarn --cwd scripts/ci/docker install
           node ./scripts/ci/docker/create-id.mjs
       - name: load-deps
         uses: ./.github/actions/load-deps
@@ -210,7 +209,6 @@ jobs:
         env:
           JSON_DATA: ${{ steps.read.outputs.result }}
         run: |
-          yarn --cwd scripts/ci/docker install
           node scripts/ci/docker/write-data.mjs
       - name: Get manifest data
         id: manifest
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,6 @@ infra/helm/**/*.tgz
 
 # dependencies
 node_modules/
-scripts/ci/docker/node_modules/
 **/.yarn/*
 !**/.yarn/patches
 !**/.yarn/releases
diff --git a/package.json b/package.json
@@ -66,6 +66,8 @@
     "mock": "nx mock"
   },
   "dependencies": {
+    "@actions/core": "1.11.1",
+    "@actions/github": "6.0.0",
     "@apollo/client": "3.7.15",
     "@apollo/gateway": "2.1.1",
     "@apollo/subgraph": "2.1.1",
diff --git a/scripts/ci/docker/.gitignore b/scripts/ci/docker/.gitignore
@@ -11,3 +11,4 @@
 
 #!.yarn/cache
 .pnp.*
+node_modules
diff --git a/scripts/ci/docker/const.mjs b/scripts/ci/docker/const.mjs
@@ -1 +1,2 @@
-export const MAIN_BRANCHES = ['main']
+export const MAIN_BRANCHES = ['main', 'mq-docker-pre-main']
+export const RELEASE_BRANCHES = ['release'];
diff --git a/scripts/ci/docker/generate-tag.mjs b/scripts/ci/docker/generate-tag.mjs
@@ -1,20 +1,24 @@
 // @ts-check
 import github from '@actions/github'
 import core from '@actions/core'
-import { MAIN_BRANCHES } from './const.mjs';
+import { MAIN_BRANCHES, RELEASE_BRANCHES } from './const.mjs';
 
 const randomTag = createRandomString(16)
 const context = github.context
 const eventName = context.eventName
 const sha = context.payload.pull_request?.head.sha || context.sha
 
 const targetBranch = getTargetBranch()
+
+core.setOutput('SHOULD_RUN_BUILD', JSON.stringify(shouldRun()))
+if (!shouldRun()) {
+    process.exit(0);
+}
 const typeOfDeployment = getTypeOfDeployment()
 const artifactName = getArtifactname()
 const tagName = getTagname()
 
 core.setOutput('ARTIFACT_NAME', artifactName)
-core.setOutput('SHOULD_RUN_BUILD', JSON.stringify(shouldRun()))
 core.setOutput('DOCKER_TAG', tagName)
 core.setOutput('GIT_BRANCH', targetBranch)
 core.setOutput('GIT_SHA', sha)
@@ -23,11 +27,15 @@ console.info(`Docker tag: ${tagName}`)
 console.info(`Git branch: ${targetBranch}`)
 console.info(`Git SHA: ${sha}`)
 
+
 function shouldRun() {
     if (eventName === 'merge_group') {
         if (MAIN_BRANCHES.includes(targetBranch)) {
             return true;
         }
+        if (RELEASE_BRANCHES.includes(targetBranch)) {
+            return true;
+        }
     }
     return false;
 }
@@ -79,7 +87,7 @@ function getTypeOfDeployment() {
             prod: false,
         }
     }
-    if (targetBranch.startsWith('release')) {
+    if (RELEASE_BRANCHES.includes(targetBranch)) {
         return {
             dev: false,
             prod: true,
diff --git a/scripts/ci/docker/get-data.mjs b/scripts/ci/docker/get-data.mjs
@@ -4,64 +4,79 @@ import jsyaml from 'js-yaml'
 import { execSync } from 'node:child_process'
 import core from '@actions/core'
 import github from '@actions/github'
-import { MAIN_BRANCHES } from './const.mjs';
+import { MAIN_BRANCHES, RELEASE_BRANCHES } from './const.mjs';
 import { glob } from 'glob'
 
 const context = github.context
 const branch = getBranch()
 const typeOfDeployment = getTypeOfDeployment()
 const sha = context.sha
-const name = getArtifactname()
-const url = `https://api.github.com/repos/island-is/island.is/actions/artifacts?name=${name}`
 
 const _KEY_HAS_OUTPUT = 'MQ_HAS_OUTPUT'
 const _KEY_CHANGED_FILES = 'MQ_CHANGED_FILES'
+const changedFiles = []
 
-const GITHUB_TOKEN = process.env.GITHUB_TOKEN
-const STAGE_NAME = typeOfDeployment.dev
-  ? 'dev'
-  : typeOfDeployment.staging
-  ? 'staging'
-  : typeOfDeployment.prod
-  ? 'prod'
-  : 'dev'
 
-// Read all manifest files
-const _MANIFEST_PATHS = [
-  'charts/islandis-services',
-  'charts/judicial-system-services',
-  'charts/identity-server-services',
-]
-const files = await glob(
-  `{${_MANIFEST_PATHS.join(',')}}/**/values.${STAGE_NAME}.yaml`,
-)
-const changedFiles = []
-const IMAGE_OBJECT = {}
-for (const file of files) {
-  const textContent = readFileSync(file, 'utf8')
-  const yamlContent = await jsyaml.load(textContent)
-  if (
-    yamlContent &&
-    typeof yamlContent === 'object' &&
-    'image' in yamlContent &&
-    yamlContent.image &&
-    typeof yamlContent.image === 'object' &&
-    'repository' in yamlContent.image
-  ) {
-    const repository = yamlContent.image.repository
-    const imageName =
-      typeof repository == 'string' ? repository.split('/').pop() : ''
-    IMAGE_OBJECT[imageName] ??= []
-    IMAGE_OBJECT[imageName].push({
-      filePath: file,
-      content: yamlContent,
-    })
+if (typeOfDeployment.dev) {
+  await prepareManifests('dev');
+}
+
+if (typeOfDeployment.staging) {
+  await prepareManifests('staging');
+}
+
+if (typeOfDeployment.prod) {
+  await prepareManifests('prod');
+}
+
+if (changedFiles.length > 0) {
+  console.log(`Changed files is ${changedFiles.join(',')}`)
+  core.setOutput(_KEY_HAS_OUTPUT, 'true')
+  core.setOutput(_KEY_CHANGED_FILES, changedFiles.join(','))
+} else {
+  console.log('No files changed')
+  core.setOutput(_KEY_HAS_OUTPUT, 'false')
+}
+
+async function prepareManifests(STAGE_NAME) {
+  const IMAGE_OBJECT = {}
+
+  // Read all manifest files
+  const _MANIFEST_PATHS = [
+    'charts/islandis-services',
+    'charts/judicial-system-services',
+    'charts/identity-server-services',
+  ]
+  const files = await glob(
+    `{${_MANIFEST_PATHS.join(',')}}/**/values.${STAGE_NAME}.yaml`,
+  )
+  for (const file of files) {
+    const textContent = readFileSync(file, 'utf8')
+    const yamlContent = await jsyaml.load(textContent)
+    if (
+      yamlContent &&
+      typeof yamlContent === 'object' &&
+      'image' in yamlContent &&
+      yamlContent.image &&
+      typeof yamlContent.image === 'object' &&
+      'repository' in yamlContent.image
+    ) {
+      const repository = yamlContent.image.repository
+      const imageName =
+        typeof repository == 'string' ? repository.split('/').pop() : ''
+      IMAGE_OBJECT[imageName] ??= []
+      IMAGE_OBJECT[imageName].push({
+        filePath: file,
+        content: yamlContent,
+      })
+    }
   }
+
+  await parseData(IMAGE_OBJECT)
 }
 
-await parseData()
 
-async function parseData() {
+async function parseData(IMAGE_OBJECT) {
   const fileName = `/tmp/data.json`
   if (!fs.existsSync(fileName)) {
     process.exit(0)
@@ -85,9 +100,6 @@ async function parseData() {
       console.info(`Skipping ${imageName}…`)
     }
   }
-  console.log(`Changed files is ${changedFiles.join(',')}`)
-  core.setOutput(_KEY_HAS_OUTPUT, 'true')
-  core.setOutput(_KEY_CHANGED_FILES, changedFiles.join(','))
 }
 
 function getBranch() {
@@ -105,27 +117,12 @@ function getTypeOfDeployment() {
       prod: false,
     }
   }
-  if (branch.startsWith('release')) {
+  if (RELEASE_BRANCHES.includes(branch)) {
     return {
       dev: false,
-      staging: false,
+      staging: true,
       prod: true,
     }
   }
-  return {
-    dev: false,
-    staging: false,
-    prod: false,
-  }
-}
-
-function getArtifactname() {
-  if (typeOfDeployment.dev) {
-    return `main-${sha}`
-  }
-  if (typeOfDeployment.prod) {
-    return `release-${sha}`
-  }
-
-  throw new Error(`Unsupported`)
+  throw new Error(`Unsupported branch: ${branch}`)
 }
diff --git a/scripts/ci/docker/package.json b/scripts/ci/docker/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,4 @@`
`11`	`11`
`12`	`12`	`#!.yarn/cache`
`13`	`13`	`.pnp.*`
	`14`	`+node_modules`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-export const MAIN_BRANCHES = ['main']`
	`1`	`+export const MAIN_BRANCHES = ['main', 'mq-docker-pre-main']`
	`2`	`+export const RELEASE_BRANCHES = ['release'];`