Merge remote-tracking branch 'upstream/master' into 12-31-add_integra…

…tions_with_readwise_apis
NangoHQ · Jan 11, 2025 · c3582ef · c3582ef
2 parents f50b432 + 40f3b0d
commit c3582ef
Show file tree

Hide file tree

Showing 383 changed files with 6,629 additions and 3,740 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc b/.eslintrc
diff --git a/.github/workflows/build-image-reusable.yaml b/.github/workflows/build-image-reusable.yaml
@@ -11,12 +11,6 @@ on:
             name:
                 required: true
                 type: string
-            key_for_sentry_secret:
-                required: false
-                type: string
-            key_for_posthog_secret:
-                required: false
-                type: string
 
 jobs:
     build-container:
@@ -50,8 +44,6 @@ jobs:
 
             - name: Build image (${{ inputs.name }})
               run: |
-                  export SENTRY_KEY=${{ secrets[inputs.key_for_sentry_secret] }}
-                  export POSTHOG_KEY=${{ secrets[inputs.key_for_posthog_secret] }}
                   ./scripts/build_docker.sh build ${{ inputs.name }} ${{ env.SHA }}
 
             - name: Push image

diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
@@ -10,26 +10,18 @@ on:
 
 jobs:
     build-image:
+        # TODO: remove this, it's only needed for the frontend
         strategy:
             matrix:
                 group:
                     - name: 'staging'
                       if: true
-                      sentry_key: SENTRY_KEY_staging
 
                     - name: 'prod'
                       if: ${{ github.ref == 'refs/heads/master' }}
-                      sentry_key: SENTRY_KEY_prod
-                      posthog_key: POSTHOG_KEY_prod
-
-                    # Commented for now
-                    # - name: 'enterprise'
-                    #   if: ${{ github.ref == 'refs/heads/master' }}
 
         secrets: inherit
         uses: ./.github/workflows/build-image-reusable.yaml
         with:
             if: ${{ matrix.group.if }}
             name: ${{ matrix.group.name }}
-            key_for_sentry_secret: ${{ matrix.group.sentry_key }}
-            key_for_posthog_secret: ${{ matrix.group.posthog_key }}
diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
@@ -24,9 +24,8 @@ jobs:
         secrets: inherit
         with:
             package: server
-            run-cmd: build:staging
+            run-cmd: build:prod
             tags: -t nangohq/nango-server:staging-${{ github.event.pull_request.head.sha || github.sha }}
-
     nango-server-prod:
         if: github.ref == 'refs/heads/master'
         uses: ./.github/workflows/push-container.yaml
@@ -49,5 +48,5 @@ jobs:
         secrets: inherit
         with:
             package: server
-            run-cmd: build:enterprise
+            run-cmd: build:prod
             tags: -t nangohq/nango-server:enterprise -t nangohq/nango-server:enterprise-${{ github.event.pull_request.head.sha || github.sha }}
diff --git a/.github/workflows/tests-clients.yaml b/.github/workflows/tests-clients.yaml
@@ -9,12 +9,26 @@ on:
     merge_group:
 
 jobs:
+    compute-matrix:
+        runs-on: ubuntu-latest
+        outputs:
+            os-matrix: ${{ steps.set-os-matrix.outputs.os-matrix }}
+        steps:
+            - name: Set OS Matrix
+              id: set-os-matrix
+              run: |
+                  if [[ '${{ github.ref }}' == 'refs/heads/master' ]]; then
+                    echo "os-matrix=[\"ubuntu-latest\",\"windows-latest\"]" >> $GITHUB_OUTPUT
+                  else
+                    echo "os-matrix=[\"ubuntu-latest\"]" >> $GITHUB_OUTPUT
+                  fi
     tests:
+        needs: compute-matrix
         strategy:
             fail-fast: false
             matrix:
                 node-version: [18.x, 20.x, 22.x]
-                os: [ubuntu-latest, windows-latest]
+                os: ${{ fromJson(needs.compute-matrix.outputs.os-matrix) }}
 
         runs-on: ${{ matrix.os }}