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

CI updates #1503

Merged
merged 3 commits into from
Jul 5, 2022
Merged

CI updates #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd4ad74
monthly dependabot updates
kremalicious Jun 8, 2022
c042c01
branch trigger changes
kremalicious Jun 8, 2022
1306174
checkout barge `main`, bump action
kremalicious Jun 14, 2022
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
3 changes: 1 addition & 2 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ version: 2
updates:
- package-ecosystem: npm
directory: '/'
versioning-strategy: increase
schedule:
interval: daily
interval: monthly
time: '03:00'
timezone: Europe/Berlin
28 changes: 12 additions & 16 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
- v4main
- v3
alexcos20 marked this conversation as resolved.
Show resolved Hide resolved
tags:
- '**'
pull_request:
Expand All @@ -15,7 +15,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: '16'
Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: '16'
Expand All @@ -48,15 +48,15 @@ jobs:
restore-keys: ${{ runner.os }}-test-unit-${{ env.cache-name }}-

- name: Checkout Barge
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: 'oceanprotocol/barge'
path: 'barge'

- name: Run Ganache with Barge
kremalicious marked this conversation as resolved.
Show resolved Hide resolved
working-directory: ${{ github.workspace }}/barge
run: |
bash -x start_ocean.sh --no-aquarius --no-elasticsearch --no-provider --no-dashboard 2>&1 > start_ocean.log &
bash -x start_ocean.sh --no-aquarius --no-elasticsearch --no-provider --no-dashboard 2>&1 > start_ocean.log &
- run: npm ci
- name: Wait for contracts deployment
working-directory: ${{ github.workspace }}/barge
Expand All @@ -77,7 +77,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: '16'
Expand All @@ -96,7 +96,7 @@ jobs:
run: echo "ADDRESS_FILE=${HOME}/.ocean/ocean-contracts/artifacts/address.json" >> $GITHUB_ENV

- name: Checkout Barge
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: 'oceanprotocol/barge'
path: 'barge'
Expand Down Expand Up @@ -124,13 +124,12 @@ jobs:
sleep 10
[ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" -a -f "$HOME/.ocean/ocean-c2d/ready" ] && break
done


- name: integration
run: npm run test:integration:cover
env:
PROVIDER_URL: 'http://172.15.0.4:8030'
- name: docker logs
- name: docker logs
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
Expand All @@ -149,7 +148,7 @@ jobs:
node: ['15', '16']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
Expand All @@ -170,7 +169,7 @@ jobs:
needs: [test_unit, test_integration]
if: ${{ success() && github.actor != 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/download-artifact@v2
with:
name: coverage
Expand All @@ -187,13 +186,13 @@ jobs:
runs-on: ubuntu-latest
needs: [test_unit, test_integration]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: '16'

- name: checkout ocean.js repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: 'oceanprotocol/ocean.js'
path: 'ocean.js'
Expand All @@ -207,6 +206,3 @@ jobs:

- name: Create Guide & Commit if there are changes
run: npm run commit:guide



2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v2
with:
node-version: '16'
Expand Down