From 340c7d782862ca55d7cbc2f40199e10168d31663 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Thu, 1 Sep 2022 15:44:14 -0500 Subject: [PATCH 01/14] fixed incorrect reference in docs Signed-off-by: Paul Schultz --- .../src/docs/no-version/understanding-a-devfile-registry.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/docs/src/docs/no-version/understanding-a-devfile-registry.md b/libs/docs/src/docs/no-version/understanding-a-devfile-registry.md index cca870c2..ed3605f4 100644 --- a/libs/docs/src/docs/no-version/understanding-a-devfile-registry.md +++ b/libs/docs/src/docs/no-version/understanding-a-devfile-registry.md @@ -6,8 +6,8 @@ description: Understanding a devfile registry A devfile registry is a service that stores and provides devfile stacks to Kubernetes developer tools like `odo`, Eclipse Che, and the OpenShift Developer Console. Therefore, you can access devfiles through the -devfile registry. Devfile registries are based on the Oracle Cloud -Infrastructure (OCI) Specification, and devfile stacks are stored as OCI +devfile registry. Devfile registries are based on the Open Container +Initiative (OCI) Specification, and devfile stacks are stored as OCI artifacts in the registry. Each devfile stack corresponds to a specific runtime or framework, such From 879e203e003cbe35d548b6f622df790cf2e76288 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 10:35:06 -0500 Subject: [PATCH 02/14] removed prebuild as a cacheableOperation Signed-off-by: Paul Schultz --- nx.json | 1 - 1 file changed, 1 deletion(-) diff --git a/nx.json b/nx.json index d0a17506..537854b9 100644 --- a/nx.json +++ b/nx.json @@ -18,7 +18,6 @@ "runner": "@nrwl/nx-cloud", "options": { "cacheableOperations": [ - "prebuild", "build", "export", "postexport", From c8e1b8c6150e8a6ee098a478ceda1f6823eca6bc Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 10:40:28 -0500 Subject: [PATCH 03/14] added prebuild as a cacheableOperation Signed-off-by: Paul Schultz --- nx.json | 1 + 1 file changed, 1 insertion(+) diff --git a/nx.json b/nx.json index 537854b9..d0a17506 100644 --- a/nx.json +++ b/nx.json @@ -18,6 +18,7 @@ "runner": "@nrwl/nx-cloud", "options": { "cacheableOperations": [ + "prebuild", "build", "export", "postexport", From cebb11db6505e97c3cbc5a7f0140a77c1239f913 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 10:42:41 -0500 Subject: [PATCH 04/14] added --skip-nx-cache to workflows Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/deploy-landing-page.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 383d5c72..81eecadf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,11 +20,11 @@ jobs: npx nx-cloud record -- npx nx workspace-lint npx nx-cloud record -- npx nx format:check parallel-commands-on-agents: | - npx nx affected --target=lint --parallel=3 - npx nx affected --target=test --parallel=3 --ci --code-coverage + npx nx affected --target=lint --parallel=3 --skip-nx-cache + npx nx affected --target=test --parallel=3 --ci --code-coverage --skip-nx-cache final-commands: | - npx nx affected --target=build --parallel=3 - npx nx affected --target=e2e --parallel=3 + npx nx affected --target=build --parallel=3 --skip-nx-cache + npx nx affected --target=e2e --parallel=3 --skip-nx-cache agents: name: Nx Cloud - Agents diff --git a/.github/workflows/deploy-landing-page.yml b/.github/workflows/deploy-landing-page.yml index b3b5aa3f..1e994b0f 100644 --- a/.github/workflows/deploy-landing-page.yml +++ b/.github/workflows/deploy-landing-page.yml @@ -31,7 +31,7 @@ jobs: - name: Install and Build run: | yarn install --frozen-lockfile - yarn nx affected --target=postexport --project=landing-page + yarn nx affected --target=postexport --project=landing-page --skip-nx-cache if [ -d ./dist/apps/landing-page/exported ]; then echo "is_new_build=true" >> $GITHUB_ENV From b3fc72c937d691ec4ab50847bdafb6d9769f41c8 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 11:48:10 -0500 Subject: [PATCH 05/14] made e2e tests its own workflow Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 1 - .github/workflows/e2e.yml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/e2e.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81eecadf..344322a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,6 @@ jobs: npx nx affected --target=test --parallel=3 --ci --code-coverage --skip-nx-cache final-commands: | npx nx affected --target=build --parallel=3 --skip-nx-cache - npx nx affected --target=e2e --parallel=3 --skip-nx-cache agents: name: Nx Cloud - Agents diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml new file mode 100644 index 00000000..4e8d8f11 --- /dev/null +++ b/.github/workflows/e2e.yml @@ -0,0 +1,32 @@ +name: E2E +on: + push: + branches: + - main + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true + +jobs: + main: + name: Main Job + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set SHA + uses: nrwl/nx-set-shas@v2 + + - name: Install + run: | + yarn install + + - name: E2E tests + run: | + yarn nx affected --target=e2e --parallel=3 --skip-nx-cache From 48f20ca1ffb60dbe057161cd3c9d31f0b9fee374 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 12:16:23 -0500 Subject: [PATCH 06/14] added NX_SKIP_NX_CACHE in workflow Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 9 ++++++--- .github/workflows/deploy-landing-page.yml | 3 ++- apps/landing-page/project.json | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 344322a8..ea6d7173 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,14 +16,17 @@ jobs: secrets: inherit with: number-of-agents: 3 + environment-variables: | + NX_SKIP_NX_CACHE=true parallel-commands: | npx nx-cloud record -- npx nx workspace-lint npx nx-cloud record -- npx nx format:check parallel-commands-on-agents: | - npx nx affected --target=lint --parallel=3 --skip-nx-cache - npx nx affected --target=test --parallel=3 --ci --code-coverage --skip-nx-cache + npx nx affected --target=lint --parallel=3 + npx nx affected --target=test --parallel=3 --ci --code-coverage final-commands: | - npx nx affected --target=build --parallel=3 --skip-nx-cache + npx nx affected --target=build --parallel=3 + npx nx affected --target=e2e --parallel=3 agents: name: Nx Cloud - Agents diff --git a/.github/workflows/deploy-landing-page.yml b/.github/workflows/deploy-landing-page.yml index 1e994b0f..d714ccac 100644 --- a/.github/workflows/deploy-landing-page.yml +++ b/.github/workflows/deploy-landing-page.yml @@ -18,6 +18,7 @@ jobs: NEXT_PUBLIC_DOCSEARCH_APP_ID: FCRPEMIKYK NEXT_PUBLIC_DOCSEARCH_API_KEY: 3f20b782c93da03c6626d6cacae0ceb5 NEXT_PUBLIC_DOCSEARCH_INDEX_NAME: devfile + NX_SKIP_NX_CACHE: true steps: - name: Checkout @@ -31,7 +32,7 @@ jobs: - name: Install and Build run: | yarn install --frozen-lockfile - yarn nx affected --target=postexport --project=landing-page --skip-nx-cache + yarn nx affected --target=postexport --project=landing-page if [ -d ./dist/apps/landing-page/exported ]; then echo "is_new_build=true" >> $GITHUB_ENV diff --git a/apps/landing-page/project.json b/apps/landing-page/project.json index 66897d05..367d858b 100644 --- a/apps/landing-page/project.json +++ b/apps/landing-page/project.json @@ -7,7 +7,8 @@ "executor": "nx:run-commands", "dependsOn": ["^build"], "options": { - "command": "yarn docs" + "command": "yarn docs", + "skip-nx-cache": true } }, "build": { From 3fbeb0e70caf25017323791ea7bd7ab9eacf5b5e Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 13:44:21 -0500 Subject: [PATCH 07/14] workflow test Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea6d7173..ec0eb791 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,6 @@ jobs: npx nx affected --target=lint --parallel=3 npx nx affected --target=test --parallel=3 --ci --code-coverage final-commands: | - npx nx affected --target=build --parallel=3 npx nx affected --target=e2e --parallel=3 agents: From f70f784e025fb04602fb01de13adc78c47eb58d3 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 13:48:17 -0500 Subject: [PATCH 08/14] workflow test Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 4 +++- apps/landing-page/project.json | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec0eb791..53ec5f8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,13 +18,15 @@ jobs: number-of-agents: 3 environment-variables: | NX_SKIP_NX_CACHE=true + init-commands: | + npx nx affected --target=prebuild --parallel=3 parallel-commands: | npx nx-cloud record -- npx nx workspace-lint npx nx-cloud record -- npx nx format:check parallel-commands-on-agents: | npx nx affected --target=lint --parallel=3 npx nx affected --target=test --parallel=3 --ci --code-coverage - final-commands: | + npx nx affected --target=build --parallel=3 npx nx affected --target=e2e --parallel=3 agents: diff --git a/apps/landing-page/project.json b/apps/landing-page/project.json index 367d858b..66897d05 100644 --- a/apps/landing-page/project.json +++ b/apps/landing-page/project.json @@ -7,8 +7,7 @@ "executor": "nx:run-commands", "dependsOn": ["^build"], "options": { - "command": "yarn docs", - "skip-nx-cache": true + "command": "yarn docs" } }, "build": { From 0e62abec8dccfe4787c1d0d95a392eded3a1f586 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 13:53:01 -0500 Subject: [PATCH 09/14] workflow test Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 14 +++++++------- .github/workflows/e2e.yml | 32 -------------------------------- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 .github/workflows/e2e.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53ec5f8c..5c097680 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,23 +15,23 @@ jobs: uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.6 secrets: inherit with: - number-of-agents: 3 + number-of-agents: 4 environment-variables: | NX_SKIP_NX_CACHE=true init-commands: | - npx nx affected --target=prebuild --parallel=3 + npx nx affected --target=prebuild --parallel=4 parallel-commands: | npx nx-cloud record -- npx nx workspace-lint npx nx-cloud record -- npx nx format:check parallel-commands-on-agents: | - npx nx affected --target=lint --parallel=3 - npx nx affected --target=test --parallel=3 --ci --code-coverage - npx nx affected --target=build --parallel=3 - npx nx affected --target=e2e --parallel=3 + npx nx affected --target=lint --parallel=4 + npx nx affected --target=test --parallel=4 --ci --code-coverage + npx nx affected --target=build --parallel=4 + npx nx affected --target=e2e --parallel=4 agents: name: Nx Cloud - Agents uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.6 secrets: inherit with: - number-of-agents: 3 + number-of-agents: 4 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml deleted file mode 100644 index 4e8d8f11..00000000 --- a/.github/workflows/e2e.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: E2E -on: - push: - branches: - - main - pull_request: - -concurrency: - group: ${{ github.workflow }}-${{ github.event.number || github.ref }} - cancel-in-progress: true - -jobs: - main: - name: Main Job - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set SHA - uses: nrwl/nx-set-shas@v2 - - - name: Install - run: | - yarn install - - - name: E2E tests - run: | - yarn nx affected --target=e2e --parallel=3 --skip-nx-cache From 45566ddc2921b5e1e4f67fb298da1ce20f8226e7 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 14:02:26 -0500 Subject: [PATCH 10/14] changed deploy landing page workflow Signed-off-by: Paul Schultz --- .github/workflows/deploy-landing-page.yml | 11 +++++------ libs/docs/src/config/github-docs-url.ts | 1 + libs/docs/src/config/index.ts | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 libs/docs/src/config/github-docs-url.ts diff --git a/.github/workflows/deploy-landing-page.yml b/.github/workflows/deploy-landing-page.yml index d714ccac..dd623abf 100644 --- a/.github/workflows/deploy-landing-page.yml +++ b/.github/workflows/deploy-landing-page.yml @@ -29,14 +29,13 @@ jobs: - name: Set SHA uses: nrwl/nx-set-shas@v2 - - name: Install and Build + - name: Install + run: yarn install --frozen-lockfile + + - name: Build run: | - yarn install --frozen-lockfile yarn nx affected --target=postexport --project=landing-page - - if [ -d ./dist/apps/landing-page/exported ]; then - echo "is_new_build=true" >> $GITHUB_ENV - fi + [ -d ./dist/apps/landing-page/exported ] && echo "is_new_build=true" >> $GITHUB_ENV - name: Deploy to Branch uses: JamesIves/github-pages-deploy-action@v4 diff --git a/libs/docs/src/config/github-docs-url.ts b/libs/docs/src/config/github-docs-url.ts new file mode 100644 index 00000000..77e17a1f --- /dev/null +++ b/libs/docs/src/config/github-docs-url.ts @@ -0,0 +1 @@ +export const githubDocsUrl = 'https://github.com/devfile/devfile-web/tree/main/libs/docs/src/docs'; diff --git a/libs/docs/src/config/index.ts b/libs/docs/src/config/index.ts index af8f7672..f9cfe814 100644 --- a/libs/docs/src/config/index.ts +++ b/libs/docs/src/config/index.ts @@ -1,3 +1,2 @@ -export const githubDocsUrl = 'https://github.com/devfile/devfile-web/tree/main/libs/docs/src/docs'; - +export * from './github-docs-url'; export * from './version'; From d75d24f67f8aa734912e1c5014f68aa443eb30c2 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 14:09:35 -0500 Subject: [PATCH 11/14] test workflow Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c097680..53ec5f8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,23 +15,23 @@ jobs: uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.6 secrets: inherit with: - number-of-agents: 4 + number-of-agents: 3 environment-variables: | NX_SKIP_NX_CACHE=true init-commands: | - npx nx affected --target=prebuild --parallel=4 + npx nx affected --target=prebuild --parallel=3 parallel-commands: | npx nx-cloud record -- npx nx workspace-lint npx nx-cloud record -- npx nx format:check parallel-commands-on-agents: | - npx nx affected --target=lint --parallel=4 - npx nx affected --target=test --parallel=4 --ci --code-coverage - npx nx affected --target=build --parallel=4 - npx nx affected --target=e2e --parallel=4 + npx nx affected --target=lint --parallel=3 + npx nx affected --target=test --parallel=3 --ci --code-coverage + npx nx affected --target=build --parallel=3 + npx nx affected --target=e2e --parallel=3 agents: name: Nx Cloud - Agents uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.6 secrets: inherit with: - number-of-agents: 4 + number-of-agents: 3 From fbebf2c2d0ad192f35f89c0d77d8cec7adf3c4de Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 14:26:08 -0500 Subject: [PATCH 12/14] removed yarn from prebuild Signed-off-by: Paul Schultz --- apps/landing-page/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/landing-page/project.json b/apps/landing-page/project.json index 66897d05..3ba00d8b 100644 --- a/apps/landing-page/project.json +++ b/apps/landing-page/project.json @@ -7,7 +7,7 @@ "executor": "nx:run-commands", "dependsOn": ["^build"], "options": { - "command": "yarn docs" + "command": "bash ./scripts/docs.sh" } }, "build": { From 11a650b1a6938668da57681c34f581be92e482e5 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 14:36:42 -0500 Subject: [PATCH 13/14] removed prebuild as a cacheable operation Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 2 -- .github/workflows/deploy-landing-page.yml | 1 - nx.json | 1 - 3 files changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53ec5f8c..4b4a0732 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,6 @@ jobs: secrets: inherit with: number-of-agents: 3 - environment-variables: | - NX_SKIP_NX_CACHE=true init-commands: | npx nx affected --target=prebuild --parallel=3 parallel-commands: | diff --git a/.github/workflows/deploy-landing-page.yml b/.github/workflows/deploy-landing-page.yml index dd623abf..1ab2b64c 100644 --- a/.github/workflows/deploy-landing-page.yml +++ b/.github/workflows/deploy-landing-page.yml @@ -18,7 +18,6 @@ jobs: NEXT_PUBLIC_DOCSEARCH_APP_ID: FCRPEMIKYK NEXT_PUBLIC_DOCSEARCH_API_KEY: 3f20b782c93da03c6626d6cacae0ceb5 NEXT_PUBLIC_DOCSEARCH_INDEX_NAME: devfile - NX_SKIP_NX_CACHE: true steps: - name: Checkout diff --git a/nx.json b/nx.json index d0a17506..537854b9 100644 --- a/nx.json +++ b/nx.json @@ -18,7 +18,6 @@ "runner": "@nrwl/nx-cloud", "options": { "cacheableOperations": [ - "prebuild", "build", "export", "postexport", From 926fb986371d8992a479b7d0cf9c345dd0dbaa3b Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 2 Sep 2022 14:45:39 -0500 Subject: [PATCH 14/14] remove nx cloud workflow Signed-off-by: Paul Schultz --- .github/workflows/ci.yml | 54 ++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b4a0732..5a9bce17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,25 +11,35 @@ concurrency: jobs: main: - name: Nx Cloud - Main Job - uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.6 - secrets: inherit - with: - number-of-agents: 3 - init-commands: | - npx nx affected --target=prebuild --parallel=3 - parallel-commands: | - npx nx-cloud record -- npx nx workspace-lint - npx nx-cloud record -- npx nx format:check - parallel-commands-on-agents: | - npx nx affected --target=lint --parallel=3 - npx nx affected --target=test --parallel=3 --ci --code-coverage - npx nx affected --target=build --parallel=3 - npx nx affected --target=e2e --parallel=3 - - agents: - name: Nx Cloud - Agents - uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.6 - secrets: inherit - with: - number-of-agents: 3 + name: Main Job + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set SHA + uses: nrwl/nx-set-shas@v2 + + - name: Install + run: yarn install --frozen-lockfile + + - name: Lint + run: | + yarn nx workspace-lint + yarn nx format:check + yarn nx affected --target=lint --parallel=3 + + - name: Test + run: | + yarn nx affected --target=test --parallel=3 --ci --code-coverage + + - name: Build + run: | + yarn nx affected --target=build --parallel=3 + + - name: E2E + run: | + yarn nx affected --target=e2e --parallel=3