diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..e509f3ca1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + commit-message: + prefix: "CHORE(NPM) - " + reviewers: + - "evergreen-ci/evg-ui" diff --git a/apps/spruce/.github/pull_request_template.md b/.github/pull_request_template.md similarity index 100% rename from apps/spruce/.github/pull_request_template.md rename to .github/pull_request_template.md diff --git a/README.md b/README.md index 013c81116..8147c26c4 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# ui \ No newline at end of file +# Evergreen UI + +The new home of [Spruce](/apps/spruce) and [Parsley](/apps/parsley). diff --git a/apps/parsley/.github/dependabot.yml b/apps/parsley/.github/dependabot.yml deleted file mode 100644 index 5e5ca4092..000000000 --- a/apps/parsley/.github/dependabot.yml +++ /dev/null @@ -1,17 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - package-ecosystem: "npm" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - open-pull-requests-limit: 3 - commit-message: - # Prefix all commit messages with "npm" - prefix: "CHORE(NPM) - " - reviewers: - - "evergreen-ci/evg-ui" diff --git a/apps/parsley/.github/pull_request_template.md b/apps/parsley/.github/pull_request_template.md deleted file mode 100644 index 6d2ee8228..000000000 --- a/apps/parsley/.github/pull_request_template.md +++ /dev/null @@ -1,13 +0,0 @@ -DEVPROD-NNNN - -### Description - - -### Screenshots - - -### Testing - - -### Evergreen PR - diff --git a/apps/parsley/.github/workflows/codeql.yml b/apps/parsley/.github/workflows/codeql.yml deleted file mode 100644 index 03c40bb68..000000000 --- a/apps/parsley/.github/workflows/codeql.yml +++ /dev/null @@ -1,76 +0,0 @@ -# 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. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "main" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "main" ] - schedule: - - cron: '16 16 * * 4' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'javascript' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Use only 'java' to analyze code written in Java, Kotlin or both - # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - 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. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" diff --git a/apps/spruce/.github/dependabot.yml b/apps/spruce/.github/dependabot.yml deleted file mode 100644 index 5e5ca4092..000000000 --- a/apps/spruce/.github/dependabot.yml +++ /dev/null @@ -1,17 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - package-ecosystem: "npm" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - open-pull-requests-limit: 3 - commit-message: - # Prefix all commit messages with "npm" - prefix: "CHORE(NPM) - " - reviewers: - - "evergreen-ci/evg-ui" diff --git a/apps/spruce/.github/workflows/codeql.yml b/apps/spruce/.github/workflows/codeql.yml deleted file mode 100644 index 57dabfb1f..000000000 --- a/apps/spruce/.github/workflows/codeql.yml +++ /dev/null @@ -1,76 +0,0 @@ -# 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. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "main" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "main" ] - schedule: - - cron: '21 5 * * 1' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'javascript' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Use only 'java' to analyze code written in Java, Kotlin or both - # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - 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. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" diff --git a/git-merge.sh b/git-merge.sh deleted file mode 100755 index 65102dc27..000000000 --- a/git-merge.sh +++ /dev/null @@ -1,21 +0,0 @@ -git remote add spruce https://github.com/evergreen-ci/spruce.git -git fetch spruce main -git branch spruce-main spruce/main -git checkout spruce-main -mkdir -p apps/spruce -git ls-tree -z --name-only HEAD | xargs -0 -I {} git mv {} apps/spruce -git add . -git commit -m "Moved Spruce into apps/" -git checkout main -git merge --allow-unrelated-histories spruce-main - -git remote add parsley https://github.com/evergreen-ci/parsley.git -git fetch parsley main -git branch parsley-main parsley/main -git checkout parsley-main -mkdir -p apps/parsley -git ls-tree -z --name-only HEAD | xargs -0 -I {} git mv {} apps/parsley -git add . -git commit -m "Moved Parsley into apps/" -git checkout main -git merge --allow-unrelated-histories parsley-main