diff --git a/.github/workflows/add-issue-labels.yaml b/.github/workflows/add-issue-labels.yaml index 075ac5d99f..8db01a51cc 100644 --- a/.github/workflows/add-issue-labels.yaml +++ b/.github/workflows/add-issue-labels.yaml @@ -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 }} diff --git a/.github/workflows/build-and-upload-release.yaml b/.github/workflows/build-and-upload-release.yaml index d9b3f1f7f5..7f514d00fd 100644 --- a/.github/workflows/build-and-upload-release.yaml +++ b/.github/workflows/build-and-upload-release.yaml @@ -2,11 +2,7 @@ name: Build Dashboard (Release) on: push: tags: -<<<<<<< HEAD - v2.* -======= - - v2.9.* ->>>>>>> b7384b5fad (Revert "script adjustment/fix") jobs: build-validation: diff --git a/.github/workflows/build-and-upload.yaml b/.github/workflows/build-and-upload.yaml index 3ca35d98bd..434ca3bef7 100644 --- a/.github/workflows/build-and-upload.yaml +++ b/.github/workflows/build-and-upload.yaml @@ -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 diff --git a/.github/workflows/build-extension-catalog.yml b/.github/workflows/build-extension-catalog.yml index 18698a41c8..bbd6bbd6ed 100644 --- a/.github/workflows/build-extension-catalog.yml +++ b/.github/workflows/build-extension-catalog.yml @@ -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 diff --git a/.github/workflows/build-extension-charts.yml b/.github/workflows/build-extension-charts.yml index 72fb2cc762..a1ffe2d621 100644 --- a/.github/workflows/build-extension-charts.yml +++ b/.github/workflows/build-extension-charts.yml @@ -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 diff --git a/.github/workflows/check-plugins.yaml b/.github/workflows/check-plugins.yaml index bb723a937c..112680f5a2 100644 --- a/.github/workflows/check-plugins.yaml +++ b/.github/workflows/check-plugins.yaml @@ -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 diff --git a/.github/workflows/docusaurus.yaml b/.github/workflows/docusaurus.yaml index 12558bb672..b434d89279 100644 --- a/.github/workflows/docusaurus.yaml +++ b/.github/workflows/docusaurus.yaml @@ -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 diff --git a/.github/workflows/pr-gh-project.yaml b/.github/workflows/pr-gh-project.yaml index 3d8627d884..971dc8c265 100644 --- a/.github/workflows/pr-gh-project.yaml +++ b/.github/workflows/pr-gh-project.yaml @@ -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: diff --git a/.github/workflows/rancher-components.yaml b/.github/workflows/rancher-components.yaml index 009ec203c8..fcd829aef7 100644 --- a/.github/workflows/rancher-components.yaml +++ b/.github/workflows/rancher-components.yaml @@ -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 diff --git a/.github/workflows/release-rancher-components.yml b/.github/workflows/release-rancher-components.yml index a06afff717..28313b443b 100644 --- a/.github/workflows/release-rancher-components.yml +++ b/.github/workflows/release-rancher-components.yml @@ -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' diff --git a/.github/workflows/release-rancher-desktop.yml b/.github/workflows/release-rancher-desktop.yml deleted file mode 100644 index 4b6e149222..0000000000 --- a/.github/workflows/release-rancher-desktop.yml +++ /dev/null @@ -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 diff --git a/.github/workflows/release-shell-pkg.yaml b/.github/workflows/release-shell-pkg.yaml index 6ed0543e9d..12e50b6ef2 100644 --- a/.github/workflows/release-shell-pkg.yaml +++ b/.github/workflows/release-shell-pkg.yaml @@ -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' diff --git a/.github/workflows/storybook.yaml b/.github/workflows/storybook.yaml index ab1029a1fd..dcbef3c778 100644 --- a/.github/workflows/storybook.yaml +++ b/.github/workflows/storybook.yaml @@ -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 \ No newline at end of file