Skip to content

Commit

Permalink
chore: Fix daily alpha to generate release PR
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastian Malton <[email protected]>
  • Loading branch information
Nokel81 committed May 4, 2023
1 parent 1b30b50 commit d989ee1
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 6 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/daily-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Node.js
uses: actions/setup-node@v3
Expand All @@ -26,8 +28,10 @@ jobs:

- name: Create PR
run: |
git fetch
git config --local user.email "[email protected]"
git config --local user.name "K8s Lens Bot"
npm run create-release-pr
env:
BUMP_PACKAGE_ARGS: -- --conventional-commits --conventional-prerelease --yes
PICK_ALL_PRS: "true"
GH_TOKEN: ${{ secrets.GH_TOKEN }}
28 changes: 23 additions & 5 deletions packages/release-tool/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
import assert from "assert";
import chalk from "chalk";
import child_process, { spawn } from "child_process";
import child_process, { ExecFileOptions, spawn as _spawn } from "child_process";
import { readFile } from "fs/promises";
import inquirer from "inquirer";
import { createInterface, ReadLine } from "readline";
Expand All @@ -15,8 +15,26 @@ import { promisify } from "util";
type SemVer = semver.SemVer;

const { SemVer } = semver;
const exec = promisify(child_process.exec);
const execFile = promisify(child_process.execFile);
const _exec = promisify(child_process.exec);
const _execFile = promisify(child_process.execFile);

const exec = ((cmd, ...args) => {
console.log("EXEC", cmd);

return _exec(cmd, ...args as any[]);
}) as typeof _exec;

const execFile = (file: string, args: string[], opts?: ExecFileOptions) => {
console.log("EXEC", file, args);

return _execFile(file, args, opts);
};

const spawn = ((file, ...args) => {
console.log("SPAWN", file);

return _spawn(file, ...args as any[]);
}) as typeof _spawn;

async function pipeExecFile(file: string, args: string[], opts?: { stdin: string }) {
const p = execFile(file, args);
Expand Down Expand Up @@ -188,7 +206,7 @@ function sortExtendedGithubPrData(left: ExtendedGithubPrData, right: ExtendedGit
}

async function getRelevantPRs(previousReleasedVersion: string, baseBranch: string): Promise<ExtendedGithubPrData[]> {
console.log("retrieving previous 200 PRs...");
console.log(`retrieving previous 200 PRs from ${baseBranch}...`);

const milestone = formatVersionForPickingPrs(await getCurrentVersionOfSubPackage("core"));
const getMergedPrsArgs = [
Expand Down Expand Up @@ -316,7 +334,7 @@ async function pickRelevantPrs(prs: ExtendedGithubPrData[], isMasterBranch: bool
throw new Error("Cannot pick relevant PRs for release if there are none. Are the milestones on github correct?");
}

if (isMasterBranch) {
if (isMasterBranch || process.env.PICK_ALL_PRS === "true") {
return prs;
}

Expand Down

0 comments on commit d989ee1

Please sign in to comment.