Merge branch 'main' into feature/web-grants-apply-cards

island-is · Dec 20, 2024 · 9331bcb · 9331bcb
2 parents 47b9272 + 27a704f
commit 9331bcb
Show file tree

Hide file tree

Showing 42 changed files with 2 additions and 1,458 deletions.
diff --git a/.github/workflows/config-values.yaml b/.github/workflows/config-values.yaml
@@ -6,17 +6,12 @@ on:
       - 'main'
       - 'release/**'
       - 'pre-release/**'
-      - '!unicorn-pipe-rel3'
-      - '!feature/unicorn-app'
     paths:
       - 'charts/**'
       - 'infra/**'
       - '**/infra/**'
   workflow_dispatch: {}
   pull_request:
-    branches:
-      - '!uni-pr'
-      - '!feature/unicorn-app'
     paths:
       - 'charts/**'
       - 'infra/**'

diff --git a/.github/workflows/external-checks.yml b/.github/workflows/external-checks.yml
@@ -1,9 +1,7 @@
 name: External checks
 
 on:
-  pull_request:
-    branches-ignore:
-      - 'feature/unicorn-app'
+  pull_request: {}
   workflow_dispatch: {}
 
 defaults:

diff --git a/.github/workflows/merge-queue-ci.yml b/.github/workflows/merge-queue-ci.yml
diff --git a/.github/workflows/pullrequest-close.yml b/.github/workflows/pullrequest-close.yml
@@ -4,9 +4,6 @@ on:
   pull_request:
     types:
       - closed
-    branches-ignore:
-      - 'uni-pr'
-      - 'feature/unicorn-app'
 
 defaults:
   run:

diff --git a/.github/workflows/pullrequest-lint.yml b/.github/workflows/pullrequest-lint.yml
@@ -6,9 +6,6 @@ on:
       - reopened
       - edited
       - synchronize
-    branches-ignore:
-      - 'uni-pr'
-      - 'feature/unicorn-app'
 
 defaults:
   run:

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -1,10 +1,7 @@
 name: Monorepo pipeline - pull request
 
 on:
-  pull_request:
-    branches-ignore:
-      - 'uni-pr'
-      - 'feature/unicorn-app'
+  pull_request: {}
   workflow_dispatch: {}
 
 defaults:

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -6,18 +6,13 @@ on:
       - 'main'
       - 'release/**'
       - 'pre-release/**'
-      - '!uni-pr'
-      - '!feature/unicorn-app'
     paths-ignore:
       - '**/*.md'
     tags:
       - docker-build-*
   workflow_dispatch:
   create:
   pull_request:
-    branches:
-      - '!uni-pr'
-      - '!feature/unicorn-app'
     types:
       - opened
       - synchronize

diff --git a/.github/workflows/revert-pr.yaml b/.github/workflows/revert-pr.yaml
@@ -8,11 +8,7 @@ on:
       - completed
     branches:
       - main
-      - '!uni-pr'
-      - '!feature/unicorn-app'
   pull_request:
-    branches:
-      - '!uni-pr'
     types:
       - opened
       - synchronize

diff --git a/.github/workflows/unicorns.yml b/.github/workflows/unicorns.yml
diff --git a/.gitignore b/.gitignore
@@ -31,7 +31,6 @@ TODO
 .env
 .env.*
 .envrc.private
-nx-cloud.env
 .nvmrc
 .node-version
 # IDE - VSCode

diff --git a/apps/unicorn-app/.eslintrc.json b/apps/unicorn-app/.eslintrc.json
diff --git a/apps/unicorn-app/codegen.yml b/apps/unicorn-app/codegen.yml
diff --git a/apps/unicorn-app/index.d.ts b/apps/unicorn-app/index.d.ts
diff --git a/apps/unicorn-app/infra/infra.ts b/apps/unicorn-app/infra/infra.ts
diff --git a/apps/unicorn-app/jest.config.ts b/apps/unicorn-app/jest.config.ts
diff --git a/apps/unicorn-app/next-env.d.ts b/apps/unicorn-app/next-env.d.ts
diff --git a/apps/unicorn-app/next.config.js b/apps/unicorn-app/next.config.js