Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework our version matching algorithm #217

Merged
merged 20 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7e372b1
Update some dependencies' versions (also, get rid of husky)
paulo-ferraz-oliveira Jun 22, 2023
0724187
Introduce branch dependency execution
paulo-ferraz-oliveira Jun 22, 2023
b49c93c
Rid ourselves of bloat
paulo-ferraz-oliveira Jun 22, 2023
b324365
Introduce expectations for upcoming version
paulo-ferraz-oliveira Jun 22, 2023
40fd5f4
Tweak whitespace
paulo-ferraz-oliveira Jun 22, 2023
5cd8299
Tweak our calls to getVersionFromSpec (increase code consistency)
paulo-ferraz-oliveira Jun 22, 2023
ab34b3b
Remove non-used variable
paulo-ferraz-oliveira Jun 22, 2023
d562423
Start coercing on input, stop sorting/maybe prepending 'v' on input
paulo-ferraz-oliveira Jun 22, 2023
ca8049f
Revamp our getVersionFromSpec
paulo-ferraz-oliveira Jun 22, 2023
fa70a82
Reduce our expectations, but still be appropriate to our mission
paulo-ferraz-oliveira Jun 23, 2023
e06852f
Update our tests for our new expectations (start the TDD bit)
paulo-ferraz-oliveira Jun 23, 2023
0a96fb1
Execute npm run build-dist and keep results
paulo-ferraz-oliveira Jun 23, 2023
4960d20
Increase inter-job dependency
paulo-ferraz-oliveira Jun 23, 2023
79a27d8
Don't expect markdownlint to be installed remotely
paulo-ferraz-oliveira Jun 23, 2023
0f04e6e
Revert "Increase inter-job dependency"
paulo-ferraz-oliveira Jun 23, 2023
3e94d49
Revert "Introduce branch dependency execution"
paulo-ferraz-oliveira Jun 23, 2023
b210439
Have all the CI workflows run under the same conditions
paulo-ferraz-oliveira Jun 23, 2023
bd45a7f
Fix as per CI results
paulo-ferraz-oliveira Jun 23, 2023
ebd8271
Re-establish the possibility to match versions like 22.3.4.2.1.0
paulo-ferraz-oliveira Jun 25, 2023
6ba70af
Trim out linting practices
paulo-ferraz-oliveira Jun 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
---
env:
node: true
es2021: true
es2022: true
extends:
- airbnb
- eslint:recommended
parserOptions:
ecmaVersion: 12
ecmaVersion: 2022
rules:
indent: ["warn", 2]
max-len: ["warn", 100]
no-undef: "error"
no-unused-vars: ["error", {"varsIgnorePattern": "^_"}]
indent: [warn, 2]
max-len: [warn, 100]
no-use-before-define: 0
operator-linebreak: 0
require-jsdoc: 0
semi: 0

settings:
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
branches:
- main
pull_request:
types: [opened, synchronize]
branches:
- main

env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand All @@ -19,16 +20,8 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '14'
- run: npm install -g npm
- run: npm install
- run: npm run build
- run: npm run format
- run: npm install -g markdownlint-cli
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was moved to package.json which means this whole npm ... pipeline can simply be as it is proposed here.

- run: npm run markdownlint
- run: npm run shellcheck
- run: npm run yamllint
- run: npm run jslint
node-version: '16'
- run: npm run build-dist
- name: Check if build left artifacts
run: git diff --exit-code --ignore-space-at-eol

Expand All @@ -39,7 +32,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '16'
- run: npm ci
- run: npm test
- name: .tool-versions test
Expand All @@ -56,6 +49,6 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '16'
- run: npm install --production
- run: npm test
7 changes: 3 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
branches:
- main
pull_request:
types: [opened, synchronize]
branches:
- main

jobs:
integration_test:
Expand Down Expand Up @@ -111,12 +112,10 @@ jobs:
otp-version: '22.3.4.1'
os: 'ubuntu-20.04'
version-type: 'strict'
- elixir-version: '1.10.3'
otp-version: '22.3.4.1'
os: 'ubuntu-20.04'
Comment on lines -114 to -116
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We find this above, already, with version-type: strict.

- elixir-version: 'main'
otp-version: '23.1'
os: 'ubuntu-20.04'
version-type: 'strict'
- elixir-version: 'main'
otp-version: '25'
os: 'ubuntu-20.04'
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/update_3rd_party_licenses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '14'
- run:
./.github/workflows/update_3rd_party_licenses.sh
env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
branches:
- main
pull_request:
types: [opened, synchronize]
branches:
- main

jobs:
integration_test:
Expand Down
Loading