Skip to content

Commit

Permalink
fix: 🐛 squash
Browse files Browse the repository at this point in the history
  • Loading branch information
DhariniJeeva committed May 16, 2024
1 parent 1d8542d commit 387c7a5
Show file tree
Hide file tree
Showing 41 changed files with 4,879 additions and 4,764 deletions.
207 changes: 106 additions & 101 deletions .github/workflows/build-admin-ui.yaml
Original file line number Diff line number Diff line change
@@ -1,102 +1,107 @@
name: Build Admin UI
on:
push:
branches:
- main
- "release/**"
workflow_dispatch:
# name: Build Admin UI
# on:
# push:
# branches:
# - main
# - "release/**"
# workflow_dispatch:

jobs:
dependencies:
name: Install dependencies
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
id: node-modules-cache
with:
path: "**/node_modules"
key: node-modules-${{ hashFiles('**/yarn.lock') }}
save-always: true
restore-keys: |
node-modules-
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 20
cache: yarn
cache-dependency-path: yarn.lock
- run: yarn install
build-admin-ui-oss:
name: Build Admin UI OSS
needs: [dependencies]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
id: node-modules-cache
with:
path: "**/node_modules"
key: node-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node-modules-
- name: Build
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 20
- run: yarn run build:ui:admin:oss
- name: Upload artifact admin-ui
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
with:
name: admin-ui
path: ./ui/admin/dist/
- name: Upload artifact OSS admin UI
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
with:
name: admin-ui-oss
path: ./ui/admin/dist/
build-admin-ui-enterprise:
name: Build Admin UI Enterprise
needs: [dependencies]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
id: node-modules-cache
with:
path: "**/node_modules"
key: node-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node-modules-
- name: Build
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 20
- run: yarn run build:ui:admin:enterprise
- name: Upload artifact enterprise admin UI
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
with:
name: admin-ui-ent
path: ./ui/admin/dist/
build-admin-ui-hcp:
name: Build Admin UI HCP
needs: [dependencies]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
id: node-modules-cache
with:
path: "**/node_modules"
key: node-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node-modules-
- name: Build
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 20
- run: yarn run build:ui:admin:hcp
- name: Upload artifact HCP admin UI
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
with:
name: admin-ui-hcp
path: ./ui/admin/dist/
# jobs:
# dependencies:
# name: Install dependencies
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
# # - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
# # id: node-modules-cache
# # with:
# # path: "**/node_modules"
# # key: node-modules-${{ hashFiles('**/yarn.lock') }}
# # save-always: true
# # restore-keys: |
# # node-modules-
# - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
# with:
# node-version: 20
# cache: yarn
# cache-dependency-path: "ui/yarn.lock"
# - run: yarn install --immutable
# build-admin-ui-oss:
# name: Build Admin UI OSS
# needs: [dependencies]
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
# # - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
# # id: node-modules-cache
# # with:
# # path: "**/node_modules"
# # key: node-modules-${{ hashFiles('**/yarn.lock') }}
# # restore-keys: |
# # node-modules-
# - name: Build
# uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
# with:
# node-version: 20
# cache: yarn
# cache-dependency-path: "ui/yarn.lock"
# - run: yarn run build:ui:admin:oss
# - name: Upload artifact admin-ui
# uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
# with:
# name: admin-ui
# path: ./ui/admin/dist/
# - name: Upload artifact OSS admin UI
# uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
# with:
# name: admin-ui-oss
# path: ./ui/admin/dist/
# build-admin-ui-enterprise:
# name: Build Admin UI Enterprise
# needs: [dependencies]
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
# # - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
# # id: node-modules-cache
# # with:
# # path: "**/node_modules"
# # key: node-modules-${{ hashFiles('**/yarn.lock') }}
# # restore-keys: |
# # node-modules-
# - name: Build
# uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
# with:
# node-version: 20
# cache-dependency-path: "ui/yarn.lock"
# - run: yarn run build:ui:admin:enterprise
# - name: Upload artifact enterprise admin UI
# uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
# with:
# name: admin-ui-ent
# path: ./ui/admin/dist/
# build-admin-ui-hcp:
# name: Build Admin UI HCP
# needs: [dependencies]
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
# - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
# id: node-modules-cache
# with:
# path: "**/node_modules"
# key: node-modules-${{ hashFiles('**/yarn.lock') }}
# restore-keys: |
# node-modules-
# - name: Build
# uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
# with:
# node-version: 20
# cache: yarn
# cache-dependency-path: "ui/yarn.lock"
# - run: yarn run build:ui:admin:hcp
# - name: Upload artifact HCP admin UI
# uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
# with:
# name: admin-ui-hcp
# path: ./ui/admin/dist/
64 changes: 32 additions & 32 deletions .github/workflows/build-artifacts-for-testing-trigger.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
name: "Trigger Build Artifacts for Testing"
# name: "Trigger Build Artifacts for Testing"

on:
workflow_dispatch:
inputs:
branch:
description: Please use tag-like format n.n.n-someword (1.111.11-beta)
required: true
product_version:
required: true
type: string
description: The version number belonging to the oss binary to be used
commit:
required: true
type: string
description: The git SHA of the oss artifacts to be used
# on:
# workflow_dispatch:
# inputs:
# branch:
# description: Please use tag-like format n.n.n-someword (1.111.11-beta)
# required: true
# product_version:
# required: true
# type: string
# description: The version number belonging to the oss binary to be used
# commit:
# required: true
# type: string
# description: The git SHA of the oss artifacts to be used

jobs:
trigger-gha-build-artifacts-for-testing:
runs-on: ubuntu-latest
steps:
- name: Release description
if: github.event_name == 'workflow_dispatch'
run: |
echo "Triggering Build Artifacts for Testing using BRANCH and TEST_TAG ${{ github.event.inputs.branch }}"
- name: Trigger Build Artifacts for Testing in boundary-ui-releases
run: |
export GITHUB_TOKEN="${{ secrets.ELEVATED_GITHUB_TOKEN }}"
gh workflow run build-artifacts-for-testing.yml \
--repo hashicorp/boundary-ui-releases \
--ref main \
-f TAG="${{ inputs.branch }}" \
-f PRODUCT_VERSION="${{ inputs.product_version }}" \
-f COMMIT="${{ inputs.commit }}" \
# jobs:
# trigger-gha-build-artifacts-for-testing:
# runs-on: ubuntu-latest
# steps:
# - name: Release description
# if: github.event_name == 'workflow_dispatch'
# run: |
# echo "Triggering Build Artifacts for Testing using BRANCH and TEST_TAG ${{ github.event.inputs.branch }}"
# - name: Trigger Build Artifacts for Testing in boundary-ui-releases
# run: |
# export GITHUB_TOKEN="${{ secrets.ELEVATED_GITHUB_TOKEN }}"
# gh workflow run build-artifacts-for-testing.yml \
# --repo hashicorp/boundary-ui-releases \
# --ref main \
# -f TAG="${{ inputs.branch }}" \
# -f PRODUCT_VERSION="${{ inputs.product_version }}" \
# -f COMMIT="${{ inputs.commit }}" \
114 changes: 57 additions & 57 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: "CodeQL"

on:
push:
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [main]
schedule:
- cron: '0 19 * * 4'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
steps:
- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@c4fb451437765abf5018c6fbf22cce1a7da1e5cc # codeql-bundle-v2.17.1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@c4fb451437765abf5018c6fbf22cce1a7da1e5cc # codeql-bundle-v2.17.1
# # For most projects, this workflow file will not need changing; you simply need
# # to commit it to your repository.
# #
# # You may wish to alter this file to override the set of languages analyzed,
# # or to provide custom queries or build logic.
# name: "CodeQL"

# on:
# push:
# branches: [main]
# pull_request:
# # The branches below must be a subset of the branches above
# branches: [main]
# schedule:
# - cron: '0 19 * * 4'

# jobs:
# analyze:
# name: Analyze
# runs-on: ubuntu-latest

# strategy:
# fail-fast: false
# matrix:
# # Override automatic language detection by changing the below list
# # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
# language: ['javascript']
# # Learn more...
# # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

# steps:
# - name: Checkout repository
# uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

# # Initializes the CodeQL tools for scanning.
# - name: Initialize CodeQL
# uses: github/codeql-action/init@c4fb451437765abf5018c6fbf22cce1a7da1e5cc # codeql-bundle-v2.17.1
# with:
# languages: ${{ matrix.language }}
# # If you wish to specify custom queries, you can do so here or in a config file.
# # By default, queries listed here will override any specified in a config file.
# # Prefix the list here with "+" to use these queries and those in the config file.
# # queries: ./path/to/local/query, your-org/your-repo/queries@main

# # ℹ️ Command-line programs to run using the OS shell.
# # 📚 https://git.io/JvXDl

# # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# # and modify them (or add more) to build your code if your project
# # uses a compiled language

# #- run: |
# # make bootstrap
# # make release

# - name: Perform CodeQL Analysis
# uses: github/codeql-action/analyze@c4fb451437765abf5018c6fbf22cce1a7da1e5cc # codeql-bundle-v2.17.1
Loading

0 comments on commit 387c7a5

Please sign in to comment.