windows

xataio · Jul 18, 2024 · 73d572e · 73d572e
1 parent da2760f
commit 73d572e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 39 deletions.
diff --git a/.github/workflows/release-cli-assets.yml b/.github/workflows/release-cli-assets.yml
@@ -142,6 +142,27 @@ jobs:
           MATRIX_OS: ${{ matrix.os }}
           COMMIT_SHA: ${{ inputs.commitSha }}
 
+      # Necessary to delete deb packes before
+      # packing windows or machine runs out of space
+      - name: Release CLI Assets (Windows only)
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          rm -rf  /home/runner/work/client-ts/client-ts/cli/dist/deb
+          pnpm run release:cli
+        env:
+          PUBLISHED_PACKAGES: ${{ inputs.publishedPackages }}
+          MATRIX_OS: ${{ matrix.os }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COMMIT_SHA: ${{ inputs.commitSha }}
+          OS_OVERRIDE: windows-latest
+      - name: Upload and Promote CLI Assets (Windows only)
+        if: matrix.os == 'ubuntu-latest'
+        run: pnpm run release:cli:upload
+        env:
+          MATRIX_OS: ${{ matrix.os }}
+          COMMIT_SHA: ${{ inputs.commitSha }}
+          OS_OVERRIDE: windows-latest
+
       - name: Clean up keychain
         if: matrix.os == 'macos-latest'
         run: |

diff --git a/scripts/release-cli.ts b/scripts/release-cli.ts
@@ -29,7 +29,7 @@ async function main() {
   if (!process.env.COMMIT_SHA) throw new Error('COMMIT_SHA is not set');
   // if (!publishedPackagesContains(process.env.PUBLISHED_PACKAGES, '@xata.io/cli')) return;
 
-  const operatingSystem = matrixToOclif(process.env.MATRIX_OS);
+  const operatingSystem = matrixToOclif(process.env.OS_OVERRIDE ?? process.env.MATRIX_OS);
 
   const { manifest, fileName } = await readProjectManifest(PATH_TO_CLI);
   const {
@@ -108,27 +108,6 @@ async function main() {
   // for (const file of files) {
   //   // await uploadFiles({ pathToFile: pathToAsset + `/${file}`, fileName: file, octokit, releaseId: release.data.id });
   // }
-
-  // Pack windows on linux
-  // if (operatingSystem === 'deb') {
-  //   const platform = 'win';
-  //   // Tarballs
-  //   await exec(`pnpm oclif pack tarballs --targets=${platformDistributions(platform)}`);
-  //   //Packages
-  //   await exec(`pnpm oclif pack ${platform}`);
-
-  //   // Windows packs files under "win32" directory
-  //   const pathToAssetWindows = `${PATH_TO_CLI}/dist/win32`;
-  //   const files = fs.readdirSync(pathToAssetWindows);
-  //   for (const file of files) {
-  //     // await uploadFiles({
-  //     //   pathToFile: pathToAssetWindows + `/${file}`,
-  //     //   fileName: file,
-  //     //   octokit,
-  //     //   releaseId: release.data.id
-  //     // });
-  //   }
-  // }
 }
 
 const uploadFiles = async ({

diff --git a/scripts/upload-promote.ts b/scripts/upload-promote.ts
@@ -1,9 +1,5 @@
-import { createExportableManifest } from '@pnpm/exportable-manifest';
 import { readProjectManifest } from '@pnpm/read-project-manifest';
-import { writeProjectManifest } from '@pnpm/write-project-manifest';
-import { execFile, execFileSync, exec as execRaw } from 'child_process';
-import { Octokit } from '@octokit/core';
-import fs from 'fs';
+import { exec as execRaw } from 'child_process';
 import * as util from 'util';
 import { matrixToOclif, platformDistributions } from './utils';
 const exec = util.promisify(execRaw);
@@ -12,7 +8,7 @@ async function main() {
   if (!process.env.MATRIX_OS) throw new Error('MATRIX_OS is not set');
   if (!process.env.COMMIT_SHA) throw new Error('COMMIT_SHA is not set');
 
-  const operatingSystem = matrixToOclif(process.env.MATRIX_OS);
+  const operatingSystem = matrixToOclif(process.env.OS_OVERRIDE ?? process.env.MATRIX_OS);
 
   const PATH_TO_CLI = process.cwd() + '/cli';
 
@@ -29,17 +25,6 @@ async function main() {
   // Upload packages
   await uploadS3(operatingSystem, { pkg: true });
   await promoteS3(operatingSystem, version);
-
-  // Pack windows on linux
-  // if (operatingSystem === 'deb') {
-  //   const platform = 'win';
-
-  //   // Upload Tarballs
-  //   await uploadS3(platform);
-  //   // Upload packages
-  //   await uploadS3(platform, { pkg: true });
-  //   await promoteS3(platform, version);
-  // }
 }
 main();
 

diff --git a/scripts/utils.ts b/scripts/utils.ts
@@ -4,6 +4,8 @@ export const matrixToOclif = (os: string) => {
       return 'macos';
     case 'ubuntu-latest':
       return 'deb';
+    case 'windows-latest':
+      return 'win';
     default:
       throw new Error('Unsupported OS');
   }