Merge branch 'master' into invalid_link

iamvishnusankar · Aug 9, 2023 · 37da19d · 37da19d
2 parents c14a470 + 7f8a9a8
commit 37da19d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/azure-pipeline.yml b/azure-pipeline.yml
@@ -1,9 +1,8 @@
-name: 4.1$(rev:.r)
+name: 4.2$(rev:.r)
 trigger:
   branches:
     include:
       - master
-
 pool:
   vmImage: 'ubuntu-latest'
   demands: npm
@@ -17,7 +16,7 @@ steps:
 
   # Set yarn version
   - task: Bash@3
-    displayName: 'Install'
+    displayName: 'Set yarn version'
     inputs:
       targetType: 'inline'
       script: 'yarn set version stable'
@@ -44,28 +43,19 @@ steps:
       targetType: 'inline'
       script: 'yarn install --immutable --immutable-cache'
 
-  # Build
-  - task: Bash@3
-    displayName: 'Build'
-    inputs:
-      targetType: 'inline'
-      script: 'yarn build'
-      # failOnStderr: true
-
-  # Lint
+  # Test
   - task: Bash@3
-    displayName: 'Lint'
+    displayName: 'Test'
     inputs:
       targetType: 'inline'
-      script: 'yarn lint'
-      failOnStderr: true
+      script: 'yarn test --ci'
 
-  # Test
+  # Build
   - task: Bash@3
-    displayName: 'Test'
+    displayName: 'Build'
     inputs:
       targetType: 'inline'
-      script: 'yarn test --ci'
+      script: 'yarn workspace next-sitemap build && yarn workspace next-sitemap postbuild'
 
   # Copy README
   - task: Bash@3

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "clean": "tsc --build --clean",
     "dev:test": "jest --watchAll",
     "dev:tsc": "tsc --build --watch",
-    "build": "turbo run build --force",
+    "build": "turbo run deploy --force",
     "test": "jest --ci --coverage --verbose",
     "lint": "eslint . && yarn prettier:check",
     "prettier:check": "prettier --check \"**/*.{js,mjs,cjs,jsx,json,ts,tsx,md,mdx,css,html,yml,yaml,scss,less,graphql,graphqls,gql}\"",

diff --git a/turbo.json b/turbo.json
@@ -4,6 +4,19 @@
       "dependsOn": ["^build"],
       "outputs": ["dist/**", ".next/**"]
     },
+    "postbuild": {
+      "dependsOn": ["^postbuild"],
+      "outputs": [
+        "dist/**",
+        ".next/**",
+        "public/robots.txt",
+        "public/sitemap*.xml"
+      ]
+    },
+    "deploy": {
+      "dependsOn": ["build", "postbuild"],
+      "outputs": []
+    },
     "lint": {
       "outputs": []
     },