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.

Sign up for GitHub

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

Jump to bottom

🪟🔧 Fix node version on CI #20287

Merged
merged 7 commits into from
Dec 12, 2022
+20 −38
Merged

🪟🔧 Fix node version on CI #20287

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d90af1
Fix node version on CI
timroes Dec 9, 2022
ba13022
Use lts/gallium
timroes Dec 9, 2022
958fae9
Restore setup-node actions where needed
timroes Dec 9, 2022
295fba5
Package-lock changes
timroes Dec 9, 2022
2483c1b
Regenerate package-lock.json
timroes Dec 9, 2022
acb0eb3
Merge branch 'master' into tim/node-version-ci
timroes Dec 9, 2022
7f1e086
Merge branch 'master' into tim/node-version-ci
timroes Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build-branch/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

- uses: actions/setup-python@v4
with:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/fe-validate-links.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- name: Set up CI Gradle Properties
run: |
mkdir -p ~/.gradle/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gke-kube-test-command.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is lts/* ok here? I'm assuming node is just required here (and in other workflows) for some scripting, which is unrelated to any of the frontend build/test steps?

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 is only needed for installing prettier from the build.gradle file for formatting JSON/YAML files (outside the webapp folder). The version here does not really matter, since it only needs any npm version to install prettier, so I made sure this is running on the latest lts instead of gallium.


- name: Fix EC-2 Runner
run: |
Expand Down
20 changes: 2 additions & 18 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

- uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -397,10 +397,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand Down Expand Up @@ -456,10 +452,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand Down Expand Up @@ -587,7 +579,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

- name: Set up CI Gradle Properties
run: |
Expand Down Expand Up @@ -810,10 +802,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand Down Expand Up @@ -1058,10 +1046,6 @@ jobs:
with:
java-version: "17"

- uses: actions/setup-node@v2
with:
node-version: "lts/gallium"

- name: Install unzip
shell: bash
run: sudo apt-get update && sudo apt-get install -y unzip
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/release-airbyte-os.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
node-version: "lts/*"

# necessary to install pip
- uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -83,9 +84,6 @@ jobs:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"
- uses: actions/setup-python@v4
with:
python-version: "3.9"
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/run-performance-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ jobs:
distribution: "zulu"
java-version: "14"

- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- name: Build
id: run-specific-test
run: ./gradlew allTest --tests *${{ github.event.inputs.test-name }}
1 change: 0 additions & 1 deletion airbyte-webapp-e2e-tests/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ yarn-error.log*
*.iml
/.idea

.npmrc
.env
.env.development
.env.production
Expand Down
1 change: 1 addition & 0 deletions airbyte-webapp-e2e-tests/.npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
1 change: 1 addition & 0 deletions airbyte-webapp-e2e-tests/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.18.1
2 changes: 1 addition & 1 deletion airbyte-webapp-e2e-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id "com.github.node-gradle.node" version "3.3.0"
}

def nodeVersion = System.getenv('NODE_VERSION') ?: '16.15.1'
def nodeVersion = new File("${projectDir}/.nvmrc").text.trim();

node {
download = true
Expand Down
3 changes: 3 additions & 0 deletions airbyte-webapp-e2e-tests/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions airbyte-webapp-e2e-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"name": "airbyte-webapp-e2e-tests",
"version": "0.0.0",
"description": "Airbyte e2e testing",
"engines": {
"node": "16.18.1"
},
"scripts": {
"cypress:open": "cypress open",
"cypress:ci": "CYPRESS_BASE_URL=http://localhost:8000 cypress run",
Expand Down
2 changes: 1 addition & 1 deletion airbyte-webapp/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/gallium
16.18.1
3 changes: 2 additions & 1 deletion airbyte-webapp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ plugins {
id "com.github.node-gradle.node" version "3.3.0"
}

def nodeVersion = System.getenv('NODE_VERSION') ?: '16.15.1'
// Use the node version that's defined in the .nvmrc file
def nodeVersion = new File("${projectDir}/.nvmrc").text.trim();

// This array should contain a path to all configs that are common to most build tasks and
// might affect them (i.e. if any of those files change we want to rerun most tasks)
Expand Down
2 changes: 1 addition & 1 deletion airbyte-webapp/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion airbyte-webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.40.25",
"private": true,
"engines": {
"node": ">=16.0.0"
"node": "16.18.1"
},
"scripts": {
"prepare": "cd .. && husky install airbyte-webapp/.husky",
Expand Down