ci: release

SiaFoundation · Sep 27, 2023 · 00e8b7c · 00e8b7c
1 parent 8821cd0
commit 00e8b7c
Show file tree

Hide file tree

Showing 20 changed files with 79 additions and 143 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -6,8 +6,6 @@ jobs:
   pr:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'pull_request' }}
-    permissions:
-      packages: write
     steps:
       - name: Checkout all commits
         uses: actions/checkout@v3
@@ -18,12 +16,6 @@ jobs:
         uses: ./.github/actions/setup
         with:
           node_version: 19.5.0
-      - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Commit lint
         shell: bash
         run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }}
@@ -51,13 +43,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}
           ASSETS: ${{ github.workspace }}/assets
-      - name: Containers
-        shell: bash
-        run: npx nx affected --target=container --configuration=production --parallel=5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}
-          ASSETS: ${{ github.workspace }}/assets
       - name: Export
         shell: bash
         # issue with parallelism

diff --git a/.github/workflows/release-npm.yml → .github/workflows/release-main.yml b/.github/workflows/release-npm.yml → .github/workflows/release-main.yml
@@ -12,8 +12,10 @@ env:
 concurrency: commits-to-main
 
 jobs:
-  release-npm:
+  release-main:
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
     steps:
       - name: Checkout all commits
         uses: actions/checkout@v3
@@ -23,23 +25,32 @@ jobs:
         uses: ./.github/actions/setup
         with:
           node_version: 19.5.0
+      - uses: docker/setup-buildx-action@v2
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Workspace lint
         shell: bash
         run: npx nx workspace-lint
       - name: Lint
         shell: bash
         run: npx nx run-many --target=lint --all --parallel=5
-      - name: Build
+      - name: Test
+        shell: bash
+        run: npx nx run-many --target=test --all --parallel=5
+      - name: Build for publishing
         shell: bash
         # configuration ci will put the dists in each project directory so changesets can publish
-        run: npx nx run-many --target=build --configuration=ci --all --parallel=5
+        # NOTE: changed from ci to production and added script for copy
+        run: npx nx run-many --target=build --configuration=production --all --parallel=5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}
           ASSETS: ${{ github.workspace }}/assets
-      - name: Test
-        shell: bash
-        run: npx nx run-many --target=test --all --parallel=5
+      - name: Release
+        run: ./scripts/copy-dists-for-publishing.sh
       - name: Create Release Pull Request or Publish to NPM
         uses: changesets/action@v1
         with:
@@ -48,3 +59,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Containers
+        shell: bash
+        run: npx nx run-many --target=container --configuration=production -all --parallel=5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}
+          ASSETS: ${{ github.workspace }}/assets
diff --git a/apps/assets/project.json b/apps/assets/project.json
@@ -23,13 +23,6 @@
           "extractLicenses": true,
           "sourceMap": false,
           "externalDependencies": "none"
-        },
-        "ci": {
-          "outputPath": "apps/assets/dist",
-          "optimization": true,
-          "extractLicenses": true,
-          "sourceMap": false,
-          "externalDependencies": "none"
         }
       }
     },

diff --git a/apps/crons/project.json b/apps/crons/project.json
@@ -23,13 +23,6 @@
           "extractLicenses": true,
           "sourceMap": false,
           "externalDependencies": "none"
-        },
-        "ci": {
-          "outputPath": "apps/crons/dist",
-          "optimization": true,
-          "extractLicenses": true,
-          "sourceMap": false,
-          "externalDependencies": "none"
         }
       }
     },

diff --git a/apps/explorer/project.json b/apps/explorer/project.json
@@ -42,9 +42,6 @@
               "with": "apps/explorer/config/testnet-zen.ts"
             }
           ]
-        },
-        "ci": {
-          "outputPath": "apps/explorer/dist"
         }
       }
     },

diff --git a/apps/hostd/project.json b/apps/hostd/project.json
@@ -6,9 +6,7 @@
   "targets": {
     "build": {
       "executor": "@nx/next:build",
-      "outputs": [
-        "{options.outputPath}"
-      ],
+      "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
         "outputPath": "dist/apps/hostd",
@@ -18,9 +16,6 @@
         "development": {},
         "production": {},
         "local": {},
-        "ci": {
-          "outputPath": "apps/hostd/dist"
-        },
         "export": {
           "outputPath": "dist/apps/hostd-export",
           "fileReplacements": [
@@ -52,9 +47,7 @@
     },
     "container": {
       "executor": "@nx-tools/nx-container:build",
-      "dependsOn": [
-        "build"
-      ],
+      "dependsOn": ["build"],
       "defaultConfiguration": "local",
       "options": {
         "engine": "docker",
@@ -63,38 +56,28 @@
       },
       "configurations": {
         "local": {
-          "tags": [
-            "siafoundation/web-hostd:latest"
-          ],
+          "tags": ["siafoundation/web-hostd:latest"],
           "push": false
         },
         "production": {
-          "tags": [
-            "ghcr.io/siafoundation/web-hostd:latest"
-          ],
+          "tags": ["ghcr.io/siafoundation/web-hostd:latest"],
           "push": true
         }
       }
     },
     "test": {
       "executor": "@nx/jest:jest",
-      "outputs": [
-        "{workspaceRoot}/coverage/apps/hostd"
-      ],
+      "outputs": ["{workspaceRoot}/coverage/apps/hostd"],
       "options": {
         "jestConfig": "apps/hostd/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "lint": {
       "executor": "@nx/linter:eslint",
-      "outputs": [
-        "{options.outputFile}"
-      ],
+      "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": [
-          "apps/hostd/**/*.{ts,tsx,js,jsx}"
-        ]
+        "lintFilePatterns": ["apps/hostd/**/*.{ts,tsx,js,jsx}"]
       }
     }
   },

diff --git a/apps/renterd/project.json b/apps/renterd/project.json
@@ -16,9 +16,6 @@
         "development": {},
         "production": {},
         "local": {},
-        "ci": {
-          "outputPath": "apps/renterd/dist"
-        },
         "export": {
           "outputPath": "dist/apps/renterd-export",
           "fileReplacements": [

diff --git a/apps/walletd/project.json b/apps/walletd/project.json
@@ -15,9 +15,6 @@
         "development": {},
         "production": {},
         "local": {},
-        "ci": {
-          "outputPath": "apps/walletd/dist"
-        },
         "export": {
           "outputPath": "dist/apps/walletd-export",
           "fileReplacements": [

diff --git a/apps/website/project.json b/apps/website/project.json
@@ -6,9 +6,7 @@
   "targets": {
     "build": {
       "executor": "@nx/next:build",
-      "outputs": [
-        "{options.outputPath}"
-      ],
+      "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
         "outputPath": "dist/apps/website",
@@ -23,10 +21,7 @@
       },
       "configurations": {
         "development": {},
-        "production": {},
-        "ci": {
-          "outputPath": "apps/website/dist"
-        }
+        "production": {}
       }
     },
     "serve": {
@@ -51,9 +46,7 @@
     },
     "container": {
       "executor": "@nx-tools/nx-container:build",
-      "dependsOn": [
-        "build"
-      ],
+      "dependsOn": ["build"],
       "defaultConfiguration": "local",
       "options": {
         "engine": "docker",
@@ -62,38 +55,28 @@
       },
       "configurations": {
         "local": {
-          "tags": [
-            "siafoundation/web-website:latest"
-          ],
+          "tags": ["siafoundation/web-website:latest"],
           "push": false
         },
         "production": {
-          "tags": [
-            "ghcr.io/siafoundation/web-website:latest"
-          ],
+          "tags": ["ghcr.io/siafoundation/web-website:latest"],
           "push": true
         }
       }
     },
     "test": {
       "executor": "@nx/jest:jest",
-      "outputs": [
-        "{workspaceRoot}/coverage/apps/website"
-      ],
+      "outputs": ["{workspaceRoot}/coverage/apps/website"],
       "options": {
         "jestConfig": "apps/website/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "lint": {
       "executor": "@nx/linter:eslint",
-      "outputs": [
-        "{options.outputFile}"
-      ],
+      "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": [
-          "apps/website/**/*.{ts,tsx,js,jsx}"
-        ]
+        "lintFilePatterns": ["apps/website/**/*.{ts,tsx,js,jsx}"]
       }
     }
   },

diff --git a/libs/design-system/project.json b/libs/design-system/project.json
@@ -29,11 +29,7 @@
           }
         ]
       },
-      "configurations": {
-        "ci": {
-          "outputPath": "libs/design-system/dist"
-        }
-      }
+      "configurations": {}
     },
     "lint": {
       "executor": "@nx/linter:eslint",

diff --git a/libs/react-core/project.json b/libs/react-core/project.json
@@ -24,11 +24,7 @@
           }
         ]
       },
-      "configurations": {
-        "ci": {
-          "outputPath": "libs/react-core/dist"
-        }
-      }
+      "configurations": {}
     },
     "lint": {
       "executor": "@nx/linter:eslint",

diff --git a/libs/react-hostd/project.json b/libs/react-hostd/project.json
@@ -24,11 +24,7 @@
           }
         ]
       },
-      "configurations": {
-        "ci": {
-          "outputPath": "libs/react-hostd/dist"
-        }
-      }
+      "configurations": {}
     },
     "lint": {
       "executor": "@nx/linter:eslint",

diff --git a/libs/react-icons/project.json b/libs/react-icons/project.json
@@ -24,11 +24,7 @@
           }
         ]
       },
-      "configurations": {
-        "ci": {
-          "outputPath": "libs/react-icons/dist"
-        }
-      }
+      "configurations": {}
     },
     "lint": {
       "executor": "@nx/linter:eslint",

diff --git a/libs/react-renterd/project.json b/libs/react-renterd/project.json
@@ -24,11 +24,7 @@
           }
         ]
       },
-      "configurations": {
-        "ci": {
-          "outputPath": "libs/react-renterd/dist"
-        }
-      }
+      "configurations": {}
     },
     "lint": {
       "executor": "@nx/linter:eslint",

diff --git a/libs/react-sia-central/project.json b/libs/react-sia-central/project.json
@@ -24,11 +24,7 @@
           }
         ]
       },
-      "configurations": {
-        "ci": {
-          "outputPath": "libs/react-sia-central/dist"
-        }
-      }
+      "configurations": {}
     },
     "lint": {
       "executor": "@nx/linter:eslint",

diff --git a/libs/react-walletd/project.json b/libs/react-walletd/project.json
@@ -24,11 +24,7 @@
           }
         ]
       },
-      "configurations": {
-        "ci": {
-          "outputPath": "libs/react-walletd/dist"
-        }
-      }
+      "configurations": {}
     },
     "lint": {
       "executor": "@nx/linter:eslint",
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,9 +42,6 @@ @@
                   "with": "apps/explorer/config/testnet-zen.ts"
                 }
               ]
-            },
-            "ci": {
-              "outputPath": "apps/explorer/dist"
             }
           }
         },
@@ Expand Down @@