-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into bugfix/order_fix
- Loading branch information
Showing
17 changed files
with
437 additions
and
289 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| * @mihaisc @kremalicious @alexcos20 @bogdanfazakas | ||
| * @mihaisc @alexcos20 @bogdanfazakas @paulo-ocean @mariacarmina @jamiehewitt15 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,11 +16,11 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v2 | ||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '16' | ||
| node-version: '20' | ||
| - name: Cache node_modules | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| env: | ||
| cache-name: cache-node-modules | ||
| with: | ||
|
|
@@ -35,11 +35,11 @@ jobs: | |
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v2 | ||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '16' | ||
| node-version: '20' | ||
| - name: Cache node_modules | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| env: | ||
| cache-name: cache-node-modules | ||
| with: | ||
|
|
@@ -71,21 +71,21 @@ jobs: | |
| ls -la "$HOME/.ocean/ocean-contracts/artifacts/" | ||
| - run: npm run build:metadata | ||
| - run: npm run test:unit:cover | ||
| - uses: actions/upload-artifact@v2 | ||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: coverage | ||
| name: coverage-unit | ||
| path: coverage/ | ||
|
|
||
| test_integration: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v2 | ||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '16' | ||
| node-version: '20' | ||
| - name: Cache node_modules | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| env: | ||
| cache-name: cache-node-modules | ||
| with: | ||
|
|
@@ -123,8 +123,7 @@ jobs: | |
| docker image rm node:16-alpine | ||
| docker image rm node:18 | ||
| docker image rm node:18-alpine | ||
| docker image rm buildpack-deps:buster | ||
| docker image rm buildpack-deps:bullseye | ||
| docker image rm node:20 | ||
| docker image rm debian:10 | ||
| docker image rm debian:11 | ||
| docker image rm moby/buildkit:latest | ||
|
|
@@ -144,9 +143,9 @@ jobs: | |
| run: docker logs ocean_aquarius_1 && docker logs ocean_provider_1 && docker logs ocean_provider2_1 && docker logs ocean_computetodata_1 | ||
| if: ${{ failure() }} | ||
| - name: Upload coverage | ||
| uses: actions/upload-artifact@v2 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: coverage | ||
| name: coverage-integration | ||
| path: coverage/ | ||
|
|
||
| build: | ||
|
|
@@ -156,15 +155,15 @@ jobs: | |
| fail-fast: false | ||
| matrix: | ||
| os: [ubuntu-latest, macos-latest, windows-latest] | ||
| node: ['15', '16'] | ||
| node: ['20', '18'] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v2 | ||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
| - name: Cache node_modules | ||
| uses: actions/cache@v2 | ||
| uses: actions/cache@v4 | ||
| env: | ||
| cache-name: cache-node-modules | ||
| with: | ||
|
|
@@ -181,10 +180,12 @@ jobs: | |
| if: ${{ success() && github.actor != 'dependabot[bot]' }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/download-artifact@v2 | ||
| - uses: actions/download-artifact@v4 | ||
| with: | ||
| name: coverage | ||
|
|
||
| name: coverage-unit | ||
| - uses: actions/download-artifact@v4 | ||
| with: | ||
| name: coverage-integration | ||
| - uses: paambaati/[email protected] | ||
| env: | ||
| CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} | ||
|
|
@@ -198,9 +199,9 @@ jobs: | |
| needs: [test_unit, test_integration] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v2 | ||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '16' | ||
| node-version: '20' | ||
|
|
||
| - name: checkout ocean.js repo | ||
| uses: actions/checkout@v3 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 16 | ||
| 20 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.