Skip to content

Commit

Permalink
fix: yarn downgrade for oclif linux release fixes (#2230)
Browse files Browse the repository at this point in the history
* fix: revert to yarn 1. Attempt to reimplement ryandagg/oclif/apps-upgrade-ESLINT-FIXES which has passing tests

* chore: continue to re-implement

* fix: revert to previously successful lock file and re-install
remove duplice lint rule.

* chore: revert to --frozen-lockfile for yarn 1 installs.
set up CI to validate change

* chore: revert checks in sign_deb. Move checks for deb & tarballs to only stop uploads; we need these to be tested on PRs.

* fix: correct indentation

* fix: maybe correct syntax for conditional in CI
  • Loading branch information
ryandagg authored Feb 2, 2023
1 parent c8737ca commit d0f9234
Show file tree
Hide file tree
Showing 23 changed files with 12,893 additions and 18,390 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules
packages/*/lib
packages/*/tmp
tmp
dst
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- run: yarn --immutable --network-timeout 1000000
- run: yarn --frozen-lockfile --network-timeout 1000000
- run: yarn test

acceptance:
Expand All @@ -37,7 +37,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: yarn
- run: yarn --immutable --network-timeout 1000000
- run: yarn --frozen-lockfile --network-timeout 1000000
- run: ./bin/run whoami
- run: ./scripts/run-acceptance

Expand All @@ -50,7 +50,6 @@ jobs:
working-directory: /

pack_deb:
if: github.ref == 'refs/heads/master' || github.ref_type == 'tag' && startsWith(github.ref_name, 'v' )
runs-on: ubuntu-latest
env:
HEROKU_AUTHOR: 'Heroku'
Expand All @@ -65,16 +64,16 @@ jobs:
run: |
cp yarn.lock packages/cli
cd packages/cli
yarn --immutable --network-timeout 1000000
yarn --frozen-lockfile --network-timeout 1000000
- name: Building deb
run: ./scripts/pack/deb
- uses: actions/upload-artifact@v3
if: github.ref == 'refs/heads/master' || github.ref_type == 'tag' && startsWith(github.ref_name, 'v' )
with:
name: packed-deb
path: /home/runner/work/cli/cli/packages/cli/dist

pack_tarballs:
if: github.ref == 'refs/heads/master' || github.ref_type == 'tag' && startsWith(github.ref_name, 'v' )
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -87,10 +86,11 @@ jobs:
run: |
cp yarn.lock packages/cli
cd packages/cli
yarn --immutable --network-timeout 1000000
yarn --frozen-lockfile --network-timeout 1000000
- name: Building tarballs
run: ./scripts/pack/tarballs
- uses: actions/upload-artifact@v3
if: github.ref == 'refs/heads/master' || github.ref_type == 'tag' && startsWith(github.ref_name, 'v' )
with:
name: packed-tarballs
path: /home/runner/work/cli/cli/packages/cli/dist
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
run: |
cp yarn.lock packages/cli
cd packages/cli
yarn --immutable --prefer-offline --network-timeout 1000000
yarn --frozen-lockfile --prefer-offline --network-timeout 1000000
- name: Upload production artifacts
run: |
cd packages/cli
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
- run: |
cp yarn.lock packages/cli
cd packages/cli
yarn --immutable --network-timeout 1000000
yarn --frozen-lockfile --network-timeout 1000000
./scripts/release/homebrew.js
change-management:
Expand All @@ -224,5 +224,5 @@ jobs:
steps:
- uses: actions/checkout@v3
- run: |
yarn --immutable --network-timeout 1000000
yarn --frozen-lockfile --network-timeout 1000000
./scripts/postrelease/change_management
823 changes: 0 additions & 823 deletions .yarn/releases/yarn-3.3.1.cjs

This file was deleted.

3 changes: 0 additions & 3 deletions .yarnrc.yml

This file was deleted.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@
]
},
"engines": {
"node": ">=12.0.0",
"yarn": ">=3.0.0"
"node": ">=12.0.0"
},
"packageManager": "yarn@3.3.1",
"private": true,
"scripts": {
"test": "lerna run test --concurrency 4",
Expand Down
4 changes: 3 additions & 1 deletion packages/apps/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"oclif",
"oclif-typescript"
],
"rules": {}
"rules": {
"camelcase": "off"
}
}
4 changes: 3 additions & 1 deletion packages/auth/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"oclif",
"oclif-typescript"
],
"rules": {}
"rules": {
"camelcase": "off"
}
}
3 changes: 2 additions & 1 deletion packages/autocomplete/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"oclif-typescript"
],
"rules": {
"unicorn/no-abusive-eslint-disable": "off"
"unicorn/no-abusive-eslint-disable": "off",
"camelcase": "off"
}
}
3 changes: 2 additions & 1 deletion packages/buildpacks/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"oclif-typescript"
],
"rules": {
"unicorn/no-abusive-eslint-disable": "off"
"unicorn/no-abusive-eslint-disable": "off",
"camelcase": "off"
}
}
3 changes: 2 additions & 1 deletion packages/certs/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"oclif-typescript"
],
"rules": {
"unicorn/no-abusive-eslint-disable": "off"
"unicorn/no-abusive-eslint-disable": "off",
"camelcase": "off"
}
}
3 changes: 2 additions & 1 deletion packages/ci/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"oclif-typescript"
],
"rules": {
"unicorn/no-abusive-eslint-disable": "off"
"unicorn/no-abusive-eslint-disable": "off",
"camelcase": "off"
}
}
2 changes: 1 addition & 1 deletion packages/ci/test/commands/ci/run.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ describe('ci:run', () => {
got,
'stream',
// disable below is due to incomplete type definition of `stub`
// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore-next-line
gotFake.stream,
)
Expand Down
4 changes: 3 additions & 1 deletion packages/cli/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"oclif",
"oclif-typescript"
],
"rules": {}
"rules": {
"camelcase": "off"
}
}
3 changes: 2 additions & 1 deletion packages/config/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"oclif-typescript"
],
"rules": {
"unicorn/no-abusive-eslint-disable": "off"
"unicorn/no-abusive-eslint-disable": "off",
"camelcase": "off"
}
}
1 change: 1 addition & 0 deletions packages/git/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
],
"rules": {
"unicorn/no-abusive-eslint-disable": "off",
"camelcase": "off",

}
}
3 changes: 2 additions & 1 deletion packages/local/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"oclif-typescript"
],
"rules": {
"unicorn/no-abusive-eslint-disable": "off"
"unicorn/no-abusive-eslint-disable": "off",
"camelcase": "off"
}
}
4 changes: 3 additions & 1 deletion packages/oauth/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"oclif",
"oclif-typescript"
],
"rules": {}
"rules": {
"camelcase": "off"
}
}
3 changes: 2 additions & 1 deletion packages/ps/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"oclif-typescript"
],
"rules": {
"unicorn/no-abusive-eslint-disable": "off"
"unicorn/no-abusive-eslint-disable": "off",
"camelcase": "off"
}
}
3 changes: 2 additions & 1 deletion packages/run/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"oclif-typescript"
],
"rules": {
"unicorn/no-abusive-eslint-disable": 0
"unicorn/no-abusive-eslint-disable": 0,
"camelcase": "off"
}
}
2 changes: 1 addition & 1 deletion packages/run/test/commands/run.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describeOrSkip('@acceptance run', () => {
return test
.stdout()
.do(() => {
// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
process.stdout.isTTY = false
})
Expand Down
4 changes: 3 additions & 1 deletion packages/status/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"oclif",
"oclif-typescript"
],
"rules": {}
"rules": {
"camelcase": "off"
}
}
4 changes: 3 additions & 1 deletion packages/webhooks/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"oclif",
"oclif-typescript"
],
"rules": {}
"rules": {
"camelcase": "off"
}
}
Loading

0 comments on commit d0f9234

Please sign in to comment.