Skip to content

Commit

Permalink
🪟🔧 Fix node version on CI (#20287)
Browse files Browse the repository at this point in the history
* Fix node version on CI

* Use lts/gallium

* Restore setup-node actions where needed

* Package-lock changes

* Regenerate package-lock.json
  • Loading branch information
timroes committed Dec 12, 2022
1 parent a3708eb commit bec8ef2
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-branch/action.yml
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
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
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/*"

- name: Fix EC-2 Runner
run: |
Expand Down
20 changes: 2 additions & 18 deletions .github/workflows/gradle.yml
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
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
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
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
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
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
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

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
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
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
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

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
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

0 comments on commit bec8ef2

Please sign in to comment.