From cd4ad74960b3d660f298be81285ea579f8128985 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 8 Jun 2022 15:30:46 +0200 Subject: [PATCH 1/3] monthly dependabot updates --- .github/dependabot.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8b9227cb0..58a2ed77a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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 From c042c01bd876ea4c8d3a8d46fe09ff9508c19c53 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 8 Jun 2022 15:31:01 +0200 Subject: [PATCH 2/3] branch trigger changes --- .github/workflows/ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a46766d2..6fa6de933 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - v4main + - v3 tags: - '**' pull_request: @@ -56,7 +56,7 @@ jobs: - name: Run Ganache with Barge 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 @@ -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 @@ -207,6 +206,3 @@ jobs: - name: Create Guide & Commit if there are changes run: npm run commit:guide - - - From 130617458755cab5f6118a2c69c120f5f26ab977 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 14 Jun 2022 18:46:44 +0100 Subject: [PATCH 3/3] checkout barge `main`, bump action --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/publish.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fa6de933..e66601e10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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' @@ -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' @@ -48,7 +48,7 @@ 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' @@ -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' @@ -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' @@ -148,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 }} @@ -169,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 @@ -186,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' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c72109de0..277bc9f22 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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'