Skip to content

Commit d349d65

Browse files
authored
Merge branch 'main' into add-link-checker
2 parents 1a32ab5 + eae8a31 commit d349d65

File tree

483 files changed

+70758
-204472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

483 files changed

+70758
-204472
lines changed

.github/workflows/ci.yaml

-65
This file was deleted.

.github/workflows/codeql.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ on:
1414
pull_request:
1515
paths-ignore:
1616
- 'docs/**'
17-
- 'showcase-docs/**'
18-
- '.changeset/**'
19-
branches-ignore:
20-
- 'changeset-release/**'
2117
schedule:
2218
- cron: '17 0 * * 2'
2319

.github/workflows/next-docker-build.yaml .github/workflows/next-build-image.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: Next Docker Build
15+
name: Next
1616

1717
on:
1818
push:
@@ -27,8 +27,8 @@ env:
2727
REGISTRY: quay.io
2828

2929
jobs:
30-
next-docker-build:
31-
name: Next Docker Build
30+
build-image:
31+
name: Build Image
3232
runs-on: ubuntu-latest
3333
permissions:
3434
contents: read

.github/workflows/pr-docker-build.yaml .github/workflows/pr-build-image.yaml

+3-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: PR Docker Build
15+
name: PR
1616

1717
on:
1818
pull_request_target:
1919
paths-ignore:
2020
- 'docs/**'
21-
- 'showcase-docs/**'
22-
- '.changeset/**'
23-
branches-ignore:
24-
- 'changeset-release/**'
2521

2622
concurrency:
2723
group: ${{ github.workflow }}-${{ github.event.number || github.event.pull_request.head.ref }}
@@ -31,8 +27,8 @@ env:
3127
REGISTRY: quay.io
3228

3329
jobs:
34-
pr-docker-build:
35-
name: PR Docker Build
30+
build-image:
31+
name: Build Image
3632
runs-on: ubuntu-latest
3733
permissions:
3834
contents: read

.github/workflows/pr-semantic.yaml

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: PR
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- edited
8+
- synchronize
9+
- labeled
10+
- unlabeled
11+
12+
jobs:
13+
title:
14+
name: Conventional Commits
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5
18+
id: lint_pr_title
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
with:
22+
# Since we use `conventionalcommits` preset for
23+
# `@semantic-release/commit-analyzer`, this list has to match allowed types
24+
# Ref: https://github.com/conventional-changelog/conventional-changelog-config-spec/blob/master/versions/2.2.0/README.md#types
25+
types: |
26+
feat
27+
fix
28+
chore
29+
docs
30+
style
31+
refactor
32+
perf
33+
test
34+
revert
35+
requireScope: false
36+
subjectPattern: ^(?![A-Z]).+$
37+
subjectPatternError: |
38+
The subject "{subject}" found in the pull request title "{title}"
39+
didn't match the configured pattern. Please ensure that the subject
40+
doesn't start with an uppercase character.
41+
ignoreLabels: |
42+
ignore-semantic-pull-request
43+
# For work-in-progress PRs you can typically use draft pull requests
44+
# from GitHub. However, private repositories on the free plan don't have
45+
# this option and therefore this action allows you to opt-in to using the
46+
# special "[WIP]" prefix to indicate this state. This will avoid the
47+
# validation of the PR title and the pull request checks remain pending.
48+
# Note that a second check will be reported if this is enabled.
49+
wip: true
50+
51+
- uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2
52+
# When the previous steps fails, the workflow would stop. By adding this
53+
# condition you can continue the execution with the populated error message.
54+
if: always() && (steps.lint_pr_title.outputs.error_message != null)
55+
with:
56+
header: pr-title-lint-error
57+
message: |
58+
Hey there and thank you for opening this pull request! 👋🏼
59+
60+
We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted.
61+
62+
Details:
63+
64+
```
65+
${{ steps.lint_pr_title.outputs.error_message }}
66+
```
67+
68+
# Delete a previous comment when the issue has been resolved
69+
- if: ${{ steps.lint_pr_title.outputs.error_message == null }}
70+
uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2
71+
with:
72+
header: pr-title-lint-error
73+
delete: true

.github/workflows/pr.yaml

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# Copyright 2023-2024 The Janus IDP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: PR
16+
17+
on:
18+
pull_request:
19+
20+
env:
21+
TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha }}
22+
TURBO_SCM_HEAD: ${{ github.sha }}
23+
24+
concurrency:
25+
group: ${{ github.workflow }}-${{ github.ref }}
26+
cancel-in-progress: true
27+
28+
jobs:
29+
build:
30+
name: Build with Node.js ${{ matrix.node-version }}
31+
runs-on: ubuntu-latest
32+
strategy:
33+
matrix:
34+
node-version: [20]
35+
steps:
36+
- name: Checkout
37+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
38+
with:
39+
fetch-depth: 0
40+
41+
- name: Setup Node.js
42+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
43+
with:
44+
node-version: ${{ matrix.node-version }}
45+
registry-url: 'https://registry.npmjs.org'
46+
cache: 'yarn'
47+
48+
- name: Setup local Turbo cache
49+
uses: dtinth/setup-github-actions-caching-for-turbo@cc723b4600e40a6b8815b65701d8614b91e2669e # v1
50+
51+
- name: Use app-config.example.yaml
52+
run: rm app-config.yaml && mv app-config.example.yaml app-config.yaml
53+
54+
- name: Install dependencies
55+
run: |
56+
yarn install
57+
58+
- name: Build packages
59+
run: yarn run build --concurrency=75% --affected
60+
61+
test:
62+
name: Test with Node.js ${{ matrix.node-version }}
63+
runs-on: ubuntu-latest
64+
strategy:
65+
matrix:
66+
node-version: [20]
67+
steps:
68+
- name: Checkout
69+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
70+
with:
71+
fetch-depth: 0
72+
73+
- name: Setup Node.js
74+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
75+
with:
76+
node-version: ${{ matrix.node-version }}
77+
registry-url: 'https://registry.npmjs.org'
78+
cache: 'yarn'
79+
80+
- name: Setup local Turbo cache
81+
uses: dtinth/setup-github-actions-caching-for-turbo@cc723b4600e40a6b8815b65701d8614b91e2669e # v1
82+
83+
- name: Use app-config.example.yaml
84+
run: rm app-config.yaml && mv app-config.example.yaml app-config.yaml
85+
86+
- name: Install dependencies
87+
run: |
88+
yarn install
89+
90+
- name: Run prettier
91+
run: yarn prettier:check --concurrency=75% --affected
92+
93+
- name: Run lint
94+
run: yarn run lint:check --concurrency=75% --affected
95+
96+
- name: Run tests
97+
run: yarn run test --concurrency=75% --affected

.gitignore

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ coverage
1616
node_modules/
1717

1818
# Yarn 3 files
19-
.pnp.*
20-
.yarn/*
21-
!.yarn/patches
22-
!.yarn/plugins
23-
!.yarn/releases
24-
!.yarn/sdks
25-
!.yarn/versions
19+
**/.pnp.*
20+
**/.yarn/*
21+
!**/.yarn/patches
22+
!**/.yarn/plugins
23+
!**/.yarn/releases
24+
!**/.yarn/sdks
25+
!**/.yarn/versions
2626

2727
# dotenv environment variables file
2828
.env

.ibm/pipelines/env_variables.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ GH_RHDH_QE_USER_TOKEN=$(cat /tmp/secrets/GH_RHDH_QE_USER_TOKEN)
4747

4848
GITLAB_TOKEN=$(cat /tmp/secrets/GITLAB_TOKEN)
4949

50+
RHDH_PR_OS_CLUSTER_URL=$(cat /tmp/secrets/RHDH_PR_OS_CLUSTER_URL)
51+
RHDH_PR_OS_CLUSTER_TOKEN=$(cat /tmp/secrets/RHDH_PR_OS_CLUSTER_TOKEN)
5052
K8S_CLUSTER_API_SERVER_URL=$(printf "%s" "$K8S_CLUSTER_URL" | base64 | tr -d '\n')
5153
K8S_SERVICE_ACCOUNT_TOKEN=$K8S_CLUSTER_TOKEN_ENCODED
5254
OCM_CLUSTER_URL=$(printf "%s" "$K8S_CLUSTER_URL" | base64 | tr -d '\n')
@@ -65,13 +67,15 @@ GOOGLE_USER_ID=$(cat /tmp/secrets/GOOGLE_USER_ID)
6567
GOOGLE_USER_PASS=$(cat /tmp/secrets/GOOGLE_USER_PASS)
6668
GOOGLE_2FA_SECRET=$(cat /tmp/secrets/GOOGLE_2FA_SECRET)
6769

70+
JUNIT_RESULTS="junit-results.xml"
6871
DATA_ROUTER_URL=$(cat /tmp/secrets/DATA_ROUTER_URL)
6972
DATA_ROUTER_USERNAME=$(cat /tmp/secrets/DATA_ROUTER_USERNAME)
7073
DATA_ROUTER_PASSWORD=$(cat /tmp/secrets/DATA_ROUTER_PASSWORD)
7174
DATA_ROUTER_PROJECT="main"
7275
DATA_ROUTER_AUTO_FINALIZATION_TRESHOLD=$(cat /tmp/secrets/DATA_ROUTER_AUTO_FINALIZATION_TRESHOLD)
76+
DATA_ROUTER_NEXUS_HOSTNAME=$(cat /tmp/secrets/DATA_ROUTER_NEXUS_HOSTNAME)
7377
REPORTPORTAL_HOSTNAME=$(cat /tmp/secrets/REPORTPORTAL_HOSTNAME)
74-
NEXUS_HOSTNAME=$(cat /tmp/secrets/NEXUS_HOSTNAME)
78+
SLACK_DATA_ROUTER_WEBHOOK_URL=$(cat /tmp/secrets/SLACK_DATA_ROUTER_WEBHOOK_URL)
7579
REDIS_TEMP_USER=temp
7680
REDIS_TEMP_PASS=test123
7781

.ibm/pipelines/openshift-ci-tests.sh

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set -xe
44
export PS4='[$(date "+%Y-%m-%d %H:%M:%S")] ' # logs timestamp for every cmd.
55

66
LOGFILE="test-log"
7-
JUNIT_RESULTS="junit-results.xml"
87
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
98
secret_name="rhdh-k8s-plugin-secret"
109
OVERALL_RESULT=0

.ibm/pipelines/resources/cluster_role_binding/cluster-role-binding-ocm.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,20 @@ subjects:
1515
namespace: showcase-rbac
1616
- kind: ServiceAccount
1717
name: rhdh-k8s-plugin
18-
namespace: showcase-rbac
18+
namespace: showcase-ci-nightly
1919
- kind: ServiceAccount
2020
name: rhdh-k8s-plugin
21-
namespace: showcase-ci-nightly
21+
namespace: showcase-rbac-nightly
2222
- kind: ServiceAccount
2323
name: rhdh-k8s-plugin
2424
namespace: showcase-1-2-x
2525
- kind: ServiceAccount
2626
name: rhdh-k8s-plugin
2727
namespace: showcase-rbac-1-2-x
28+
- kind: ServiceAccount
29+
name: rhdh-k8s-plugin
30+
namespace: showcase-1-3-x
31+
- kind: ServiceAccount
32+
name: rhdh-k8s-plugin
33+
namespace: showcase-rbac-1-3-x
2834

0 commit comments

Comments
 (0)