rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Alexandre Alves 2024-07-31 11:22:20 +01:00
parent a59f4ad5cf
commit 0afc69ba76
13 changed files with 1 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/add-issue-labels.yaml vendored
View File

@ -11,15 +11,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js
<<<<<<< HEAD
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
uses: actions/setup-node@v1
with:
node-version: '16.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
- name: script
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

4
.github/workflows/build-and-upload-release.yaml vendored
View File

@ -2,11 +2,7 @@ name: Build Dashboard (Release)
on:
push:
tags:
<<<<<<< HEAD
- v2.*
=======
- v2.9.*
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
jobs:
build-validation:

12
.github/workflows/build-and-upload.yaml vendored
View File

@ -27,15 +27,9 @@ jobs:
fetch-depth: 1
# Note - Cannot use the setup action here as it uses a different yarn install arg
<<<<<<< HEAD
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
- uses: actions/setup-node@v3
with:
node-version: '14.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
cache: 'yarn'
# Build a directory containing the dashboard that can be used with ui-dashboard-index
@ -80,15 +74,9 @@ jobs:
fetch-depth: 1
# Note - Cannot use the setup action here as it uses a different yarn install arg
<<<<<<< HEAD
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
- uses: actions/setup-node@v3
with:
node-version: '14.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
cache: 'yarn'
# Build a tar that will be picked up by rancher builds and embedded into it

12
.github/workflows/build-extension-catalog.yml vendored
View File

@ -48,29 +48,17 @@ jobs:
version: v3.8.0
- name: Setup Nodejs and npm
<<<<<<< HEAD
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
uses: actions/setup-node@v3
with:
node-version: '16'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
- name: Setup yarn
run: npm install -g yarn
- name: Setup Nodejs with yarn caching
<<<<<<< HEAD
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
uses: actions/setup-node@v3
with:
node-version: '16'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
cache: yarn
- name: Install dependencies

12
.github/workflows/build-extension-charts.yml vendored
View File

@ -43,29 +43,17 @@ jobs:
version: v3.8.0
- name: Setup Nodejs and npm
<<<<<<< HEAD
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
uses: actions/setup-node@v3
with:
node-version: '16'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
- name: Setup yarn
run: npm install -g yarn
- name: Setup Nodejs with yarn caching
<<<<<<< HEAD
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
uses: actions/setup-node@v3
with:
node-version: '16'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
cache: yarn
- name: Install dependencies

41
.github/workflows/check-plugins.yaml vendored
View File

@ -1,16 +1,8 @@
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 25d6584234 (comment workflows)
name: check-plugins-build
on:
pull_request:
branches:
<<<<<<< HEAD
- master
=======
- master-bananas
>>>>>>> 25d6584234 (comment workflows)
env:
TEST_PERSIST_BUILD: true
jobs:
@ -22,43 +14,10 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
<<<<<<< HEAD
<<<<<<< HEAD
node-version-file: '.nvmrc'
=======
node-version: '16.20.2'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
- name: Validate Plugin build system
run: ./shell/scripts/test-plugins-build.sh
shell: bash
=======
# name: check-plugins-build
# on:
# pull_request:
# branches:
# - master
# env:
# TEST_PERSIST_BUILD: true
# jobs:
# validate:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v4
# - name: Setup Node.js
# uses: actions/setup-node@v4
# with:
# node-version: '16.20.2'
# - name: Validate Plugin build system
# run: ./shell/scripts/test-plugins-build.sh
# shell: bash
>>>>>>> 25d643d2d3 (comment workflows)
=======
node-version: '16.20.2'
- name: Validate Plugin build system
run: ./shell/scripts/test-plugins-build.sh
shell: bash
>>>>>>> 25d6584234 (comment workflows)
- name: Upload files
uses: actions/upload-artifact@v3

42
.github/workflows/docusaurus.yaml vendored
View File

@ -1,64 +1,22 @@
name: Publish Docusaurus
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 25d6584234 (comment workflows)
on:
push:
branches:
- master
<<<<<<< HEAD
pull_request:
branches:
- master
=======
# pull_request:
# branches:
# - master
>>>>>>> 25d6584234 (comment workflows)
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
<<<<<<< HEAD
<<<<<<< HEAD
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
- uses: actions/setup-node@v3
with:
node-version: 16.x
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
cache: yarn
=======
# on:
# push:
# branches:
# - master
# pull_request:
# branches:
# - master
# jobs:
# build:
# name: Build
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - uses: actions/setup-node@v3
# with:
# node-version: 16.x
# cache: yarn
>>>>>>> 25d643d2d3 (comment workflows)
=======
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: yarn
>>>>>>> 25d6584234 (comment workflows)
- name: Install dependencies
run: cd docusaurus/ && yarn install:ci

6
.github/workflows/pr-gh-project.yaml vendored
View File

@ -14,15 +14,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js
<<<<<<< HEAD
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
uses: actions/setup-node@v1
with:
node-version: '16.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
- name: Read secrets
uses: rancher-eio/read-vault-secrets@main
with:

12
.github/workflows/rancher-components.yaml vendored
View File

@ -13,15 +13,9 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 1
<<<<<<< HEAD
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
- uses: actions/setup-node@v3
with:
node-version: '14.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
- name: Install packages
run: yarn install
@ -35,15 +29,9 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 1
<<<<<<< HEAD
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
- uses: actions/setup-node@v3
with:
node-version: '14.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
- name: Install packages
run: yarn install

6
.github/workflows/release-rancher-components.yml vendored
View File

@ -17,15 +17,9 @@ jobs:
fetch-depth: 0
persist-credentials: false
<<<<<<< HEAD
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
- uses: actions/setup-node@v3
with:
node-version: '16.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
registry-url: 'https://registry.npmjs.org'
scope: '@rancher'

58
.github/workflows/release-rancher-desktop.yml vendored
View File

@ -1,58 +0,0 @@
name: Build and Release Rancher Dashboard - Rancher Desktop Embed
on:
push:
tags:
- 'desktop-v*'
env:
OUTPUT_DIR: dist
RELEASE_DIR: release
ARTIFACT_NAME: rancher-dashboard-desktop-embed
API: "https://127.0.0.1:9443"
RESOURCE_BASE: "https://127.0.0.1:9443"
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
persist-credentials: false
- uses: actions/setup-node@v2
with:
node-version: '12.x'
- name: Install & Build
run:
ROUTER_BASE="/dashboard" RANCHER_ENV=desktop ./.github/workflows/scripts/build-dashboard.sh
- name: Upload Build
uses: actions/upload-artifact@v2
with:
path: ${{ env.RELEASE_DIR}}/${{ env.ARTIFACT_NAME }}*
name: ${{ env.ARTIFACT_NAME }}
if-no-files-found: error
release:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
persist-credentials: false
- name: Download build
uses: actions/download-artifact@v2
with:
name: ${{ env.ARTIFACT_NAME }}
path: build
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Upload Release Assets
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh release upload ${{ env.RELEASE_VERSION }} build/${{ env.ARTIFACT_NAME }}.tar.gz build/${{ env.ARTIFACT_NAME }}.tar.gz.sha512sum

12
.github/workflows/release-shell-pkg.yaml vendored
View File

@ -17,15 +17,9 @@ jobs:
fetch-depth: 0
persist-credentials: false
<<<<<<< HEAD
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
- uses: actions/setup-node@v3
with:
node-version: '16.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
- name: Validate Plugin build system
run: ./shell/scripts/test-plugins-build.sh
@ -41,15 +35,9 @@ jobs:
echo $YARN_REGISTRY
cat ./shell/package.json
<<<<<<< HEAD
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
=======
- uses: actions/setup-node@v3
with:
node-version: '16.x'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
registry-url: 'https://registry.npmjs.org'
scope: '@rancher'

52
.github/workflows/storybook.yaml vendored
View File

@ -1,7 +1,3 @@
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 25d6584234 (comment workflows)
name: storybook
env:
STORYBOOK_TOKEN: ${{ secrets.STORYBOOK_TOKEN }}
@ -9,15 +5,9 @@ on:
push:
branches:
- master
<<<<<<< HEAD
pull_request:
branches:
- master
=======
# pull_request:
# branches:
# - master
>>>>>>> 25d6584234 (comment workflows)
jobs:
storybook:
runs-on: ubuntu-latest
@ -26,15 +16,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
<<<<<<< HEAD
<<<<<<< HEAD
node-version-file: '.nvmrc'
=======
node-version: '16.20.2'
>>>>>>> b7384b5fad (Revert "script adjustment/fix")
=======
node-version: '16.20.2'
>>>>>>> 25d6584234 (comment workflows)
- name: Install packages
run: yarn install
- name: Build Storybook
@ -42,36 +24,4 @@ jobs:
yarn build-storybook
- name: Publish Storybook
if: ${{ github.event_name == 'push' && github.repository_owner == 'rancher'}}
run: .github/workflows/scripts/publish-storybook
<<<<<<< HEAD
=======
# name: storybook
# env:
# STORYBOOK_TOKEN: ${{ secrets.STORYBOOK_TOKEN }}
# on:
# push:
# branches:
# - master
# pull_request:
# branches:
# - master
# jobs:
# storybook:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - name: Use Node.js
# uses: actions/setup-node@v4
# with:
# node-version: '16.20.2'
# - name: Install packages
# run: yarn install
# - name: Build Storybook
# run: |
# yarn build-storybook
# - name: Publish Storybook
# if: ${{ github.event_name == 'push' && github.repository_owner == 'rancher'}}
# run: .github/workflows/scripts/publish-storybook
>>>>>>> 25d643d2d3 (comment workflows)
=======
>>>>>>> 25d6584234 (comment workflows)
run: .github/workflows/scripts/publish-storybook