From a4f0f8137114b9c47f539f63fd6c9e2288f72c35 Mon Sep 17 00:00:00 2001 From: paolofacchinetti Date: Fri, 17 May 2024 10:31:51 +0200 Subject: [PATCH] chore: refactor ci --- .github/workflows/test.yaml | 23 +++++++++----- .../ketchup-react/scripts/kr-npm-snapshot.js | 31 ------------------- packages/ketchup/scripts/k-npm-snapshot.js | 31 ------------------- 3 files changed, 15 insertions(+), 70 deletions(-) delete mode 100644 packages/ketchup-react/scripts/kr-npm-snapshot.js delete mode 100644 packages/ketchup/scripts/k-npm-snapshot.js diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 131d658e54..8b5be8a6cb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,14 +13,21 @@ jobs: with: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: | - cd packages/ketchup - node scripts/k-npm-snapshot.js - cd ../ketchup-react - node scripts/kr-npm-snapshot.js - cd ../.. - yarn install --no-immutable - npm run k:build + + - name: Install dependencies + run: yarn install --no-immutable + + - name: Update Version with Timestamp + run: | + VERSION=$(node -p "require('./package.json').version") + TIMESTAMP=$(date +%Y%m%d%H%M%S) + NEW_VERSION="${VERSION}-${TIMESTAMP}" + echo "New version: $NEW_VERSION" + sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/"./package.json + + - name: Run Ketchup build + run: npm run k:build + # - run: npm run publish:snapshot # env: # NODE_AUTH_TOKEN: {{ secrets.NPM_TOKEN }} diff --git a/packages/ketchup-react/scripts/kr-npm-snapshot.js b/packages/ketchup-react/scripts/kr-npm-snapshot.js deleted file mode 100644 index 0d386f7d84..0000000000 --- a/packages/ketchup-react/scripts/kr-npm-snapshot.js +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env node - -import { spawn } from "child_process"; -import path from "path"; -import fs from "fs"; - -function getPkg() { - try { - return JSON.parse( - fs.readFileSync(path.resolve(process.cwd(), "package.json")) - ); - } catch (e) { - process.stderr.write("Could not open a package.json.", e); - process.exit(1); - } -} - -function getCurrentVersion() { - return getPkg().version; -} - -const oldVersion = getCurrentVersion() ?? error("No version in package.json found."); -const version = oldVersion.replace(/-SNAPSHOT$/, `-SNAPSHOT.${new Date().toISOString().replace(/[-:TZ]/g, "")}`); -console.log("Ketchup version:",version); -const npm = spawn(/^win/.test(process.platform) ? "npm.cmd" : "npm", [ - "--no-git-tag-version", - "version", - version, -]); -npm.stdout.pipe(process.stdout); -npm.stderr.pipe(process.stderr); \ No newline at end of file diff --git a/packages/ketchup/scripts/k-npm-snapshot.js b/packages/ketchup/scripts/k-npm-snapshot.js deleted file mode 100644 index 0d386f7d84..0000000000 --- a/packages/ketchup/scripts/k-npm-snapshot.js +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env node - -import { spawn } from "child_process"; -import path from "path"; -import fs from "fs"; - -function getPkg() { - try { - return JSON.parse( - fs.readFileSync(path.resolve(process.cwd(), "package.json")) - ); - } catch (e) { - process.stderr.write("Could not open a package.json.", e); - process.exit(1); - } -} - -function getCurrentVersion() { - return getPkg().version; -} - -const oldVersion = getCurrentVersion() ?? error("No version in package.json found."); -const version = oldVersion.replace(/-SNAPSHOT$/, `-SNAPSHOT.${new Date().toISOString().replace(/[-:TZ]/g, "")}`); -console.log("Ketchup version:",version); -const npm = spawn(/^win/.test(process.platform) ? "npm.cmd" : "npm", [ - "--no-git-tag-version", - "version", - version, -]); -npm.stdout.pipe(process.stdout); -npm.stderr.pipe(process.stderr); \ No newline at end of file