From 12a49c1b7a7e1f7267c5a0361a4da1b2a0574d41 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:28:47 +0000 Subject: [PATCH 01/16] branch releases fix --- .github/workflows/branch-release.yaml | 55 +++++++++------------------ 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index cd666c2..124a51e 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -1,57 +1,40 @@ name: Branch Release -on: push +on: + push jobs: - branch-release: + branch_publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Node.js - uses: actions/setup-node@v4 + - name: Setup Node.js + uses: actions/setup-node@v3 with: - node-version: "20" - registry-url: https://registry.npmjs.org/ + node-version: '20' # Specify the Node.js version you want to use - - name: Install pnpm - uses: pnpm/action-setup@v2 - with: - version: latest + - name: Install Dependencies + run: pnpm ci - - name: Cache pnpm modules - uses: actions/cache@v4 - with: - path: | - ~/.pnpm-store - node_modules - src/playground/node_modules - key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm- - - - name: Install Full Project - run: pnpm install --frozen-lockfile - - - name: Build Full Project + - name: Build run: pnpm run build - name: Set Version from Branch run: | BRANCH_NAME=${GITHUB_REF#refs/heads/} - BRANCH_NAME=${BRANCH_NAME//\//-} # Replace slashes with dashes SHORT_SHA=$(git rev-parse --short HEAD) - # TODO: make this dynamic https://github.com/BitteProtocol/make-agent/issues/56 - BASE_VERSION="0.2.1" # Define a base version + BASE_VERSION="0.1.0" # Define a base version VERSION="${BASE_VERSION}-${BRANCH_NAME}-${SHORT_SHA}" - pnpm version $VERSION --no-git-tag-version + npm version $VERSION --no-git-tag-version - - name: Publish + - name: Configure NPM Authentication run: | - if [[ "${GITHUB_REF#refs/tags/}" == *-* ]]; then - npm publish --access public --tag beta - else - npm publish --access public - fi + echo "@bitte-ai:registry=https://registry.npmjs.org/" > ~/.npmrc + echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc + + - name: Publish with npm + if: ${{ github.ref_name != 'main'}} + run: npm publish --access public --tag beta env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file From 0dce022c0b9d7ce6c75cd8b7273c1014be78c80e Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:29:30 +0000 Subject: [PATCH 02/16] branch releases fix --- .github/workflows/branch-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 124a51e..e66471a 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -15,7 +15,7 @@ jobs: node-version: '20' # Specify the Node.js version you want to use - name: Install Dependencies - run: pnpm ci + run: pnpm run ci - name: Build run: pnpm run build From d9e9d8a8eb550144f3b4def5f736069cc97644e1 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:30:47 +0000 Subject: [PATCH 03/16] branch releases fix --- .github/workflows/branch-release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index e66471a..59527c7 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -14,6 +14,9 @@ jobs: with: node-version: '20' # Specify the Node.js version you want to use + - name: Install pnpm + run: npm install -g pnpm + - name: Install Dependencies run: pnpm run ci From 01dd1bb3581c8d565f2708f7b91a5fce91f2b1c0 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:31:43 +0000 Subject: [PATCH 04/16] branch releases fix --- .github/workflows/branch-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 59527c7..c586e63 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -18,7 +18,7 @@ jobs: run: npm install -g pnpm - name: Install Dependencies - run: pnpm run ci + run: pnpm ci - name: Build run: pnpm run build From 6feac27425c19ba0d536e127be443d5e21c467f6 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:32:47 +0000 Subject: [PATCH 05/16] branch releases fix --- .github/workflows/branch-release.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index c586e63..8839189 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -14,14 +14,11 @@ jobs: with: node-version: '20' # Specify the Node.js version you want to use - - name: Install pnpm - run: npm install -g pnpm - - name: Install Dependencies - run: pnpm ci + run: npm ci - name: Build - run: pnpm run build + run: npm run build - name: Set Version from Branch run: | From 080c8af9899be8f2cd70c36b1ecafea20cc15105 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:34:18 +0000 Subject: [PATCH 06/16] branch releases fix --- .github/workflows/branch-release.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 8839189..9ff1235 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -14,11 +14,14 @@ jobs: with: node-version: '20' # Specify the Node.js version you want to use + - name: Install pnpm + run: npm install -g pnpm + - name: Install Dependencies - run: npm ci + run: pnpm install - name: Build - run: npm run build + run: pnpm run build - name: Set Version from Branch run: | @@ -26,15 +29,15 @@ jobs: SHORT_SHA=$(git rev-parse --short HEAD) BASE_VERSION="0.1.0" # Define a base version VERSION="${BASE_VERSION}-${BRANCH_NAME}-${SHORT_SHA}" - npm version $VERSION --no-git-tag-version + pnpm version $VERSION --no-git-tag-version - name: Configure NPM Authentication run: | echo "@bitte-ai:registry=https://registry.npmjs.org/" > ~/.npmrc echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc - - name: Publish with npm + - name: Publish with pnpm if: ${{ github.ref_name != 'main'}} - run: npm publish --access public --tag beta + run: pnpm publish --access public --tag beta env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file From c10b1c0da5c447ef6d637a19c1ea141806f39c95 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:36:01 +0000 Subject: [PATCH 07/16] branch releases fix --- .github/workflows/branch-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 9ff1235..175b290 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -36,8 +36,8 @@ jobs: echo "@bitte-ai:registry=https://registry.npmjs.org/" > ~/.npmrc echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc - - name: Publish with pnpm + - name: Publish with npm if: ${{ github.ref_name != 'main'}} - run: pnpm publish --access public --tag beta + run: npm publish --access public --tag beta env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file From 61d2210fb3a909b2a54ebbc8c366bf8c6b7b2702 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:46:25 +0000 Subject: [PATCH 08/16] branch release --- .github/workflows/branch-release.yaml | 12 +++++++----- package.json | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 175b290..7771631 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -10,15 +10,17 @@ jobs: - uses: actions/checkout@v4 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: '20' # Specify the Node.js version you want to use + node-version: '20' - name: Install pnpm - run: npm install -g pnpm + uses: pnpm/action-setup@v2 + with: + version: latest - name: Install Dependencies - run: pnpm install + run: pnpm install --froze - name: Build run: pnpm run build @@ -27,7 +29,7 @@ jobs: run: | BRANCH_NAME=${GITHUB_REF#refs/heads/} SHORT_SHA=$(git rev-parse --short HEAD) - BASE_VERSION="0.1.0" # Define a base version + BASE_VERSION=$(node -p "require('./package.json').version") VERSION="${BASE_VERSION}-${BRANCH_NAME}-${SHORT_SHA}" pnpm version $VERSION --no-git-tag-version diff --git a/package.json b/package.json index 634c6ce..a2fc4fc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "make-agent", "type": "module", - "version": "0.0.22-7", + "version": "0.2.3", "main": "dist/index.js", "module": "dist/index.mjs", "types": "dist/index.d.ts", @@ -33,7 +33,7 @@ "agent", "cli" ], - "author": "Micro", + "author": "Bitte Team", "license": "MIT", "dependencies": { "@apidevtools/swagger-parser": "^10.1.0", From c83bcaaf54e6f41015207bb3330317f15ef6128e Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:47:58 +0000 Subject: [PATCH 09/16] branch release --- .github/workflows/branch-release.yaml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 7771631..8dcd411 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -13,14 +13,37 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' + - name: Cache pnpm modules + uses: actions/cache@v4 + with: + path: | + ~/.pnpm-store + node_modules + src/playground/node_modules + key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm- + - name: Install pnpm uses: pnpm/action-setup@v2 with: version: latest + - name: Cache pnpm modules + uses: actions/cache@v4 + with: + path: | + ~/.pnpm-store + node_modules + src/playground/node_modules + key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm- + + - name: Install Dependencies - run: pnpm install --froze + run: pnpm install --frozen-lockfile - name: Build run: pnpm run build From 8e8a6b709350ae81211d4bde2779abef468fb3ed Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:48:56 +0000 Subject: [PATCH 10/16] branch release --- .github/workflows/branch-release.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 8dcd411..577291f 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -13,17 +13,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' - - name: Cache pnpm modules - uses: actions/cache@v4 - with: - path: | - ~/.pnpm-store - node_modules - src/playground/node_modules - key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm- - - name: Install pnpm uses: pnpm/action-setup@v2 From ad07aad74db57350c15287d7b9f44c9689301f1a Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:51:30 +0000 Subject: [PATCH 11/16] branch release --- .github/workflows/branch-release.yaml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 577291f..86fe48f 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -4,7 +4,7 @@ on: push jobs: - branch_publish: + branch_release: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -37,11 +37,23 @@ jobs: - name: Build run: pnpm run build - - name: Set Version from Branch + - name: Set Version from Branch run: | BRANCH_NAME=${GITHUB_REF#refs/heads/} + BRANCH_NAME=${BRANCH_NAME//\//-} # Replace slashes with dashes SHORT_SHA=$(git rev-parse --short HEAD) - BASE_VERSION=$(node -p "require('./package.json').version") + + # Get the latest version tag and increment patch + LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") + LATEST_VERSION=${LATEST_TAG#v} # Remove 'v' prefix + + # Split version into major.minor.patch + IFS='.' read -r major minor patch <<< "$LATEST_VERSION" + + # Increment patch version + patch=$((patch + 1)) + BASE_VERSION="${major}.${minor}.${patch}" + VERSION="${BASE_VERSION}-${BRANCH_NAME}-${SHORT_SHA}" pnpm version $VERSION --no-git-tag-version From e3d3f383cf1bc1cedf9f3c5a6f3008d23e3cb708 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:54:05 +0000 Subject: [PATCH 12/16] branch release --- .github/workflows/branch-release.yaml | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 86fe48f..d56699a 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -37,25 +37,25 @@ jobs: - name: Build run: pnpm run build - - name: Set Version from Branch - run: | - BRANCH_NAME=${GITHUB_REF#refs/heads/} - BRANCH_NAME=${BRANCH_NAME//\//-} # Replace slashes with dashes - SHORT_SHA=$(git rev-parse --short HEAD) + - name: Set Version from Branch + run: | + BRANCH_NAME=${GITHUB_REF#refs/heads/} + BRANCH_NAME=${BRANCH_NAME//\//-} # Replace slashes with dashes + SHORT_SHA=$(git rev-parse --short HEAD) - # Get the latest version tag and increment patch - LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") - LATEST_VERSION=${LATEST_TAG#v} # Remove 'v' prefix + # Get the latest version tag and increment patch + LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") + LATEST_VERSION=${LATEST_TAG#v} # Remove 'v' prefix - # Split version into major.minor.patch - IFS='.' read -r major minor patch <<< "$LATEST_VERSION" + # Split version into major.minor.patch + IFS='.' read -r major minor patch <<< "$LATEST_VERSION" - # Increment patch version - patch=$((patch + 1)) - BASE_VERSION="${major}.${minor}.${patch}" + # Increment patch version + patch=$((patch + 1)) + BASE_VERSION="${major}.${minor}.${patch}" - VERSION="${BASE_VERSION}-${BRANCH_NAME}-${SHORT_SHA}" - pnpm version $VERSION --no-git-tag-version + VERSION="${BASE_VERSION}-${BRANCH_NAME}-${SHORT_SHA}" + pnpm version $VERSION --no-git-tag-version - name: Configure NPM Authentication run: | From 9ff7a3a25134a93f5da33a9fbf5773ceb7b28c2f Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 12:58:17 +0000 Subject: [PATCH 13/16] branch release --- .github/workflows/branch-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index d56699a..fbd6855 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -37,7 +37,7 @@ jobs: - name: Build run: pnpm run build - - name: Set Version from Branch + - name: Set Version from Branch run: | BRANCH_NAME=${GITHUB_REF#refs/heads/} BRANCH_NAME=${BRANCH_NAME//\//-} # Replace slashes with dashes From edbb743460e14a69925df5dc2ea923dd472df535 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 13:00:16 +0000 Subject: [PATCH 14/16] branch release --- .github/workflows/branch-release.yaml | 33 +++++++++++++-------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index fbd6855..492bd97 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -30,32 +30,31 @@ jobs: restore-keys: | ${{ runner.os }}-pnpm- - - name: Install Dependencies run: pnpm install --frozen-lockfile - name: Build run: pnpm run build - - name: Set Version from Branch - run: | - BRANCH_NAME=${GITHUB_REF#refs/heads/} - BRANCH_NAME=${BRANCH_NAME//\//-} # Replace slashes with dashes - SHORT_SHA=$(git rev-parse --short HEAD) + - name: Set Version from Branch + run: | + BRANCH_NAME=${GITHUB_REF#refs/heads/} + BRANCH_NAME=${BRANCH_NAME//\//-} # Replace slashes with dashes + SHORT_SHA=$(git rev-parse --short HEAD) - # Get the latest version tag and increment patch - LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") - LATEST_VERSION=${LATEST_TAG#v} # Remove 'v' prefix + # Get the latest version tag and increment patch + LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0") + LATEST_VERSION=${LATEST_TAG#v} # Remove 'v' prefix - # Split version into major.minor.patch - IFS='.' read -r major minor patch <<< "$LATEST_VERSION" + # Split version into major.minor.patch + IFS='.' read -r major minor patch <<< "$LATEST_VERSION" - # Increment patch version - patch=$((patch + 1)) - BASE_VERSION="${major}.${minor}.${patch}" + # Increment patch version + patch=$((patch + 1)) + BASE_VERSION="${major}.${minor}.${patch}" - VERSION="${BASE_VERSION}-${BRANCH_NAME}-${SHORT_SHA}" - pnpm version $VERSION --no-git-tag-version + VERSION="${BASE_VERSION}-${BRANCH_NAME}-${SHORT_SHA}" + pnpm version $VERSION --no-git-tag-version - name: Configure NPM Authentication run: | @@ -63,7 +62,7 @@ jobs: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc - name: Publish with npm - if: ${{ github.ref_name != 'main'}} + if: ${{ github.ref_name != 'main' }} run: npm publish --access public --tag beta env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file From 4387304a162fd6f08a3afa2250391a1f9f822be6 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 13:00:26 +0000 Subject: [PATCH 15/16] branch release --- .github/workflows/branch-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 492bd97..33dfb2a 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -65,4 +65,4 @@ jobs: if: ${{ github.ref_name != 'main' }} run: npm publish --access public --tag beta env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} From 35ec529a10b1bf6e41ab936200ebcaa963e79d92 Mon Sep 17 00:00:00 2001 From: Ruben Marcus Date: Wed, 5 Feb 2025 13:03:13 +0000 Subject: [PATCH 16/16] branch release --- .github/workflows/branch-release.yaml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/branch-release.yaml b/.github/workflows/branch-release.yaml index 33dfb2a..4fcddbe 100644 --- a/.github/workflows/branch-release.yaml +++ b/.github/workflows/branch-release.yaml @@ -4,7 +4,7 @@ on: push jobs: - branch_release: + branch-release: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/package.json b/package.json index a2fc4fc..c4466a8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "make-agent", "type": "module", - "version": "0.2.3", + "version": "0.0.0", "main": "dist/index.js", "module": "dist/index.mjs", "types": "dist/index.d.ts",