Skip to content

Commit

Permalink
fix: projen upgrade workflow corrupted
Browse files Browse the repository at this point in the history
  • Loading branch information
Elad Ben-Israel committed Aug 4, 2020
1 parent 4c81acc commit 8d5d556
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by projen. To modify, edit .projenrc.js and run "npx projen".
name: upgrade-projen
name: ProjenUpgrade
on:
schedule:
- cron: 0 6 * * *
Expand All @@ -18,7 +18,8 @@ jobs:
- run: yarn projen:upgrade
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
commit-message: "chore: upgrade projen"
branch: auto/projen-upgrade
title: "chore: upgrade projen"
body: This PR upgrades projen to the latest version
with:
commit-message: "chore: upgrade projen"
branch: auto/projen-upgrade
title: "chore: upgrade projen"
body: This PR upgrades projen to the latest version
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ tsconfig.json
!# synthesized by projen, (do not modify by hand)
!/.github/dependabot.yml
!# synthesized by projen, (do not modify by hand)
!/.github/workflows/upgrade-projen.yml
!/.github/workflows/projenupgrade.yml
!/src
!# synthesized by projen, (do not modify by hand)
!/.eslintrc.json
Expand Down
9 changes: 9 additions & 0 deletions API.md
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ new JsiiProject(options: JsiiProjectOptions)
* **peerDependencies** (<code>Map<string, [Semver](#projen-semver)></code>) *No description* __*Optional*__
* **peerDependencyOptions** (<code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code>) *No description* __*Optional*__
* **projenDevDependency** (<code>boolean</code>) Indicates of "projen" should be installed as a devDependency. __*Default*__: true
* **projenUpgrade** (<code>boolean</code>) Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade. __*Default*__: true
* **projenVersion** (<code>[Semver](#projen-semver)</code>) Version of projen to install. __*Default*__: latest version
* **releaseBranches** (<code>Array<string></code>) Branches which trigger a release. __*Default*__: [ "master" ]
* **releaseEveryCommit** (<code>boolean</code>) Automatically release new versions every commit to one of branches in `releaseBranches`. __*Default*__: true
Expand Down Expand Up @@ -734,6 +735,7 @@ new NodeProject(options: NodeProjectOptions)
* **peerDependencies** (<code>Map<string, [Semver](#projen-semver)></code>) *No description* __*Optional*__
* **peerDependencyOptions** (<code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code>) *No description* __*Optional*__
* **projenDevDependency** (<code>boolean</code>) Indicates of "projen" should be installed as a devDependency. __*Default*__: true
* **projenUpgrade** (<code>boolean</code>) Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade. __*Default*__: true
* **projenVersion** (<code>[Semver](#projen-semver)</code>) Version of projen to install. __*Default*__: latest version
* **releaseBranches** (<code>Array<string></code>) Branches which trigger a release. __*Default*__: [ "master" ]
* **releaseEveryCommit** (<code>boolean</code>) Automatically release new versions every commit to one of branches in `releaseBranches`. __*Default*__: true
Expand Down Expand Up @@ -1079,6 +1081,7 @@ new TypeScriptLibraryProject(options: TypeScriptProjectOptions)
* **peerDependencies** (<code>Map<string, [Semver](#projen-semver)></code>) *No description* __*Optional*__
* **peerDependencyOptions** (<code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code>) *No description* __*Optional*__
* **projenDevDependency** (<code>boolean</code>) Indicates of "projen" should be installed as a devDependency. __*Default*__: true
* **projenUpgrade** (<code>boolean</code>) Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade. __*Default*__: true
* **projenVersion** (<code>[Semver](#projen-semver)</code>) Version of projen to install. __*Default*__: latest version
* **releaseBranches** (<code>Array<string></code>) Branches which trigger a release. __*Default*__: [ "master" ]
* **releaseEveryCommit** (<code>boolean</code>) Automatically release new versions every commit to one of branches in `releaseBranches`. __*Default*__: true
Expand Down Expand Up @@ -1155,6 +1158,7 @@ new TypeScriptProject(options: TypeScriptProjectOptions)
* **peerDependencies** (<code>Map<string, [Semver](#projen-semver)></code>) *No description* __*Optional*__
* **peerDependencyOptions** (<code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code>) *No description* __*Optional*__
* **projenDevDependency** (<code>boolean</code>) Indicates of "projen" should be installed as a devDependency. __*Default*__: true
* **projenUpgrade** (<code>boolean</code>) Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade. __*Default*__: true
* **projenVersion** (<code>[Semver](#projen-semver)</code>) Version of projen to install. __*Default*__: latest version
* **releaseBranches** (<code>Array<string></code>) Branches which trigger a release. __*Default*__: [ "master" ]
* **releaseEveryCommit** (<code>boolean</code>) Automatically release new versions every commit to one of branches in `releaseBranches`. __*Default*__: true
Expand Down Expand Up @@ -1456,6 +1460,7 @@ Name | Type | Description
**peerDependencies**?🔹 | <code>Map<string, [Semver](#projen-semver)></code> | __*Optional*__
**peerDependencyOptions**?🔹 | <code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code> | __*Optional*__
**projenDevDependency**?🔹 | <code>boolean</code> | Indicates of "projen" should be installed as a devDependency.<br/>__*Default*__: true
**projenUpgrade**?🔹 | <code>boolean</code> | Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade.<br/>__*Default*__: true
**projenVersion**?🔹 | <code>[Semver](#projen-semver)</code> | Version of projen to install.<br/>__*Default*__: latest version
**python**?🔹 | <code>[JsiiPythonTarget](#projen-jsiipythontarget)</code> | __*Optional*__
**releaseBranches**?🔹 | <code>Array<string></code> | Branches which trigger a release.<br/>__*Default*__: [ "master" ]
Expand Down Expand Up @@ -1593,6 +1598,7 @@ Name | Type | Description
**peerDependencies**?🔹 | <code>Map<string, [Semver](#projen-semver)></code> | __*Optional*__
**peerDependencyOptions**?🔹 | <code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code> | __*Optional*__
**projenDevDependency**?🔹 | <code>boolean</code> | Indicates of "projen" should be installed as a devDependency.<br/>__*Default*__: true
**projenUpgrade**?🔹 | <code>boolean</code> | Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade.<br/>__*Default*__: true
**projenVersion**?🔹 | <code>[Semver](#projen-semver)</code> | Version of projen to install.<br/>__*Default*__: latest version
**releaseBranches**?🔹 | <code>Array<string></code> | Branches which trigger a release.<br/>__*Default*__: [ "master" ]
**releaseEveryCommit**?🔹 | <code>boolean</code> | Automatically release new versions every commit to one of branches in `releaseBranches`.<br/>__*Default*__: true
Expand Down Expand Up @@ -1649,6 +1655,7 @@ Name | Type | Description
**peerDependencies**?🔹 | <code>Map<string, [Semver](#projen-semver)></code> | __*Optional*__
**peerDependencyOptions**?🔹 | <code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code> | __*Optional*__
**projenDevDependency**?🔹 | <code>boolean</code> | Indicates of "projen" should be installed as a devDependency.<br/>__*Default*__: true
**projenUpgrade**?🔹 | <code>boolean</code> | Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade.<br/>__*Default*__: true
**projenVersion**?🔹 | <code>[Semver](#projen-semver)</code> | Version of projen to install.<br/>__*Default*__: latest version
**releaseBranches**?🔹 | <code>Array<string></code> | Branches which trigger a release.<br/>__*Default*__: [ "master" ]
**releaseEveryCommit**?🔹 | <code>boolean</code> | Automatically release new versions every commit to one of branches in `releaseBranches`.<br/>__*Default*__: true
Expand Down Expand Up @@ -1763,6 +1770,7 @@ Name | Type | Description
**peerDependencies**?⚠️ | <code>Map<string, [Semver](#projen-semver)></code> | __*Optional*__
**peerDependencyOptions**?⚠️ | <code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code> | __*Optional*__
**projenDevDependency**?⚠️ | <code>boolean</code> | Indicates of "projen" should be installed as a devDependency.<br/>__*Default*__: true
**projenUpgrade**?⚠️ | <code>boolean</code> | Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade.<br/>__*Default*__: true
**projenVersion**?⚠️ | <code>[Semver](#projen-semver)</code> | Version of projen to install.<br/>__*Default*__: latest version
**releaseBranches**?⚠️ | <code>Array<string></code> | Branches which trigger a release.<br/>__*Default*__: [ "master" ]
**releaseEveryCommit**?⚠️ | <code>boolean</code> | Automatically release new versions every commit to one of branches in `releaseBranches`.<br/>__*Default*__: true
Expand Down Expand Up @@ -1831,6 +1839,7 @@ Name | Type | Description
**peerDependencies**?🔹 | <code>Map<string, [Semver](#projen-semver)></code> | __*Optional*__
**peerDependencyOptions**?🔹 | <code>[PeerDependencyOptions](#projen-peerdependencyoptions)</code> | __*Optional*__
**projenDevDependency**?🔹 | <code>boolean</code> | Indicates of "projen" should be installed as a devDependency.<br/>__*Default*__: true
**projenUpgrade**?🔹 | <code>boolean</code> | Define a `projen:upgrade` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade.<br/>__*Default*__: true
**projenVersion**?🔹 | <code>[Semver](#projen-semver)</code> | Version of projen to install.<br/>__*Default*__: latest version
**releaseBranches**?🔹 | <code>Array<string></code> | Branches which trigger a release.<br/>__*Default*__: [ "master" ]
**releaseEveryCommit**?🔹 | <code>boolean</code> | Automatically release new versions every commit to one of branches in `releaseBranches`.<br/>__*Default*__: true
Expand Down
12 changes: 11 additions & 1 deletion src/node-project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,14 @@ export interface NodeProjectCommonOptions {
* @default {}
*/
readonly scripts?: { [name: string]: string }

/**
* Define a `projen:upgrade` script and a scheduled github workflow which will
* upgrade projen and submit a PR with the upgrade.
*
* @default true
*/
readonly projenUpgrade?: boolean;
}

export interface NodeProjectOptions extends NodeProjectCommonOptions {
Expand Down Expand Up @@ -562,7 +570,9 @@ export class NodeProject extends Project {
new Dependabot(this, options.dependabotOptions);
}

new ProjenUpgrade(this);
if (options.projenUpgrade ?? true) {
new ProjenUpgrade(this);
}

// override any scripts from options (if specified)
for (const [n, v] of Object.entries(options.scripts ?? {})) {
Expand Down
16 changes: 9 additions & 7 deletions src/projen-upgrade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class ProjenUpgrade {
'chmod -w package.json',
'yarn projen');

const workflow = new GithubWorkflow(project, 'upgrade-projen');
const workflow = new GithubWorkflow(project, 'ProjenUpgrade');

workflow.on({
schedule: [ { cron: '0 6 * * *' } ], // 6am every day
Expand All @@ -32,12 +32,14 @@ export class ProjenUpgrade {

// submit a PR
{
'name': 'Create Pull Request',
'uses': 'peter-evans/create-pull-request@v3',
'commit-message': 'chore: upgrade projen',
'branch': 'auto/projen-upgrade',
'title': 'chore: upgrade projen',
'body': 'This PR upgrades projen to the latest version',
name: 'Create Pull Request',
uses: 'peter-evans/create-pull-request@v3',
with: {
'commit-message': 'chore: upgrade projen',
'branch': 'auto/projen-upgrade',
'title': 'chore: upgrade projen',
'body': 'This PR upgrades projen to the latest version',
},
},
],
},
Expand Down
33 changes: 33 additions & 0 deletions test/__snapshots__/inventory.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,17 @@ Array [
"switch": "projen-dev-dependency",
"type": "boolean",
},
Object {
"default": "true",
"docs": "Define a \`projen:upgrade\` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade.",
"name": "projenUpgrade",
"optional": true,
"path": Array [
"projenUpgrade",
],
"switch": "projen-upgrade",
"type": "boolean",
},
Object {
"name": "mode",
"optional": true,
Expand Down Expand Up @@ -1438,6 +1449,17 @@ Array [
"switch": "projen-dev-dependency",
"type": "boolean",
},
Object {
"default": "true",
"docs": "Define a \`projen:upgrade\` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade.",
"name": "projenUpgrade",
"optional": true,
"path": Array [
"projenUpgrade",
],
"switch": "projen-upgrade",
"type": "boolean",
},
Object {
"name": "mode",
"optional": true,
Expand Down Expand Up @@ -2475,6 +2497,17 @@ jest typescript tests and only if all tests pass, run the compiler.",
"switch": "projen-dev-dependency",
"type": "boolean",
},
Object {
"default": "true",
"docs": "Define a \`projen:upgrade\` script and a scheduled github workflow which will upgrade projen and submit a PR with the upgrade.",
"name": "projenUpgrade",
"optional": true,
"path": Array [
"projenUpgrade",
],
"switch": "projen-upgrade",
"type": "boolean",
},
Object {
"name": "mode",
"optional": true,
Expand Down

0 comments on commit 8d5d556

Please sign in to comment.