chore: update build config

ipfs · Jan 26, 2022 · bd8767c · bd8767c
1 parent 037f902
commit bd8767c
Show file tree

Hide file tree

Showing 9 changed files with 3,196 additions and 9,612 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,5 +4,5 @@ updates:
   directory: "/"
   schedule:
     interval: daily
-    time: "11:00"
+    time: "10:00"
   open-pull-requests-limit: 10
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,21 +28,13 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 16
-      - uses: actions/cache@v2
-        env:
-          CACHE_NAME: cache-node-modules
+      - uses: ipfs/aegir/actions/cache-node-modules@master
         with:
-          path: |
+          directories: |
             /tmp/*-ipfs/**
             ./scripts/libp2p-relay-daemon
-            ~/.npm
-            ./node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
-      - name: Install Dependencies
-        run: |
-            npm install
+          build: |
             ./scripts/custom-runtime.sh
-            npm run build
 
   check:
     name: Check
@@ -53,22 +45,13 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 16
-      - uses: actions/cache@v2
-        id: cache
-        env:
-          CACHE_NAME: cache-node-modules
+      - uses: ipfs/aegir/actions/cache-node-modules@master
         with:
-          path: |
+          directories: |
             /tmp/*-ipfs/**
             ./scripts/libp2p-relay-daemon
-            ~/.npm
-            ./node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install
-          npm run build
+          build: |
+            ./scripts/custom-runtime.sh
       - run: |
           npm run lint
           npm run dep-check
@@ -82,22 +65,13 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 16
-      - uses: actions/cache@v2
-        id: cache
-        env:
-          CACHE_NAME: cache-node-modules
+      - uses: ipfs/aegir/actions/cache-node-modules@master
         with:
-          path: |
+          directories: |
             /tmp/*-ipfs/**
             ./scripts/libp2p-relay-daemon
-            ~/.npm
-            ./node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install
-          npm run build
+          build: |
+            ./scripts/custom-runtime.sh
       - run: npm run test -- -t node
 
   test-browser:
@@ -118,22 +92,13 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 16
-      - uses: actions/cache@v2
-        id: cache
-        env:
-          CACHE_NAME: cache-node-modules
+      - uses: ipfs/aegir/actions/cache-node-modules@master
         with:
-          path: |
+          directories: |
             /tmp/*-ipfs/**
             ./scripts/libp2p-relay-daemon
-            ~/.npm
-            ./node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install
-          npm run build
+          build: |
+            ./scripts/custom-runtime.sh
       - run: npm run test -- -t ${{ matrix.type }} -- --browser ${{ matrix.browser }}
 
   test-electron:
@@ -151,38 +116,36 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 16
-      - uses: actions/cache@v2
-        id: cache
-        env:
-          CACHE_NAME: cache-node-modules
+      - uses: ipfs/aegir/actions/cache-node-modules@master
         with:
-          path: |
+          directories: |
             /tmp/*-ipfs/**
             ./scripts/libp2p-relay-daemon
-            ~/.npm
-            ./node_modules
-          key: ${{ runner.os }}-build-${{ env.CACHE_NAME }}-${{ github.event.pull_request.head.sha }}
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          npm install
-          npm run build
+          build: |
+            ./scripts/custom-runtime.sh
       - uses: GabrielBB/xvfb-action@v1
         with:
           run: npm run test -- -t ${{ matrix.type }} --bail -f dist/cjs/node-test/*js
 
   release:
-    needs: [test-node, test-browser, test-electron]
+    # needs: [test-node, test-browser, test-electron]
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - uses: ipfs/aegir/actions/cache-node-modules@master
+        with:
+          directories: |
+            /tmp/*-ipfs/**
+            ./scripts/libp2p-relay-daemon
+          build: |
+            ./scripts/custom-runtime.sh
       - uses: actions/setup-node@v2
         with:
           node-version: lts/*
-      - uses: ipfs/aegir/actions/cache-node-modules@master
+
       - run: npm run --if-present release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+### [8.0.1](https://github.com/ipfs/interop/compare/v8.0.0...v8.0.1) (2022-01-26)
+
+
+### Bug Fixes
+
+* disable js dht during circuit tests ([#430](https://github.com/ipfs/interop/issues/430)) ([8a1bbd5](https://github.com/ipfs/interop/commit/8a1bbd5d26dcf568eed7c67c519e2a874c571906))
+
+
+### Trivial Changes
+
+* add auto-release ([b7fff84](https://github.com/ipfs/interop/commit/b7fff8485171db0785a2584bf7e65a69424a55ff))
+* do not use readable streams for input ([4ea14c5](https://github.com/ipfs/interop/commit/4ea14c513b270275e4d0b189be829e7b630bf12d))
+* restore ci tests on default branch ([#424](https://github.com/ipfs/interop/issues/424)) ([037f902](https://github.com/ipfs/interop/commit/037f902d815421ca3e03aadcfa6586846bb5d399)), closes [#409](https://github.com/ipfs/interop/issues/409)
+* update lockfile ([4d627a3](https://github.com/ipfs/interop/commit/4d627a3485ca8a046e6f5021bd42d2d1a48b0dac))
+* update lockfile ([0b6289a](https://github.com/ipfs/interop/commit/0b6289ab94a79c44738b9a225e8f0c7a0bbf7a1c))
+
 ## [7.0.4](https://github.com/ipfs/interop/compare/v7.0.3...v7.0.4) (2021-10-25)
 
 
@@ -128,6 +144,3 @@
 * test against js-ipfs 0.35 ([#60](https://github.com/ipfs/interop/issues/60)) ([f42567e](https://github.com/ipfs/interop/commit/f42567e))
 * test with new IPFS ([47ca31b](https://github.com/ipfs/interop/commit/47ca31b))
 * use smaller keysize ([#14](https://github.com/ipfs/interop/issues/14)) ([9241cc7](https://github.com/ipfs/interop/commit/9241cc7))
-
-
-
diff --git a/LICENSE b/LICENSE
@@ -1,21 +1,4 @@
-The MIT License (MIT)
+This project is dual licensed under MIT and Apache-2.0.
 
-Copyright (c) 2016 IPFS
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT: https://www.opensource.org/licenses/mit
+Apache-2.0: https://www.apache.org/licenses/license-2.0
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
@@ -0,0 +1,5 @@
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
@@ -0,0 +1,19 @@
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.