Skip to content

Commit

Permalink
Merge branch 'master' into fix/pass-config-show-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
SgtPooki committed Sep 13, 2022
2 parents f1f5bf8 + b099e16 commit a278d5e
Show file tree
Hide file tree
Showing 34 changed files with 854 additions and 528 deletions.
27 changes: 14 additions & 13 deletions .aegir.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
'use strict'

const path = require('path')
const getPort = require('aegir/utils/get-port')
const createServer = require('./src').createServer
import { createServer } from './src/index.js'
import * as ipfsModule from 'ipfs'
import * as ipfsHttpModule from 'ipfs-http-client'
import * as goIpfsModule from 'go-ipfs'

/** @type {import('aegir').Options["build"]["config"]} */
/*
const esbuild = {
inject: [path.join(__dirname, 'scripts/node-globals.js')],
}

module.exports = {
*/
export default {
bundlesize: {
maxSize: '35kB'
},
test: {
browser: {
config: {
buildConfig: esbuild
//buildConfig: esbuild
}
},
before: async () => {
const server = createServer(undefined, {
ipfsModule: require('ipfs'),
ipfsHttpModule: require('ipfs-http-client')
ipfsModule,
ipfsHttpModule
}, {
go: {
ipfsBin: require('go-ipfs').path()
ipfsBin: goIpfsModule.path()
},
js: {
ipfsBin: require('ipfs').path()
ipfsBin: ipfsModule.path()
}
}
)

await server.start(await getPort(server.port, server.host))
await server.start()

return {
env: {
IPFSD_CTL_SERVER: `http://${server.host}:${server.port}`
Expand Down
5 changes: 4 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ updates:
directory: "/"
schedule:
interval: daily
time: "11:00"
time: "10:00"
open-pull-requests-limit: 10
commit-message:
prefix: "deps"
prefix-development: "deps(dev)"
11 changes: 11 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.

name: Automerge
on: [ pull_request ]

jobs:
automerge:
uses: protocol/.github/.github/workflows/automerge.yml@master
with:
job: 'automerge'
148 changes: 148 additions & 0 deletions .github/workflows/js-test-and-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.

name: test & maybe release
on:
push:
branches:
- master # with #262 - ${{{ github.default_branch }}}
pull_request:
branches:
- master # with #262 - ${{{ github.default_branch }}}

jobs:

check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present lint
- run: npm run --if-present dep-check

test-node:
needs: check
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
node: [16]
fail-fast: true
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:node
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: node

test-chrome:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: chrome

test-chrome-webworker:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome-webworker
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: chrome-webworker

test-firefox:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: firefox

test-firefox-webworker:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox-webworker
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: firefox-webworker

test-electron-main:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-main
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: electron-main

test-electron-renderer:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-renderer
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
with:
flags: electron-renderer

release:
needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-electron-main, test-electron-renderer]
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.ref == 'refs/heads/master' # with #262 - 'refs/heads/${{{ github.default_branch }}}'
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- uses: ipfs/aegir/actions/docker-login@master
with:
docker-token: ${{ secrets.DOCKER_TOKEN }}
docker-username: ${{ secrets.DOCKER_USERNAME }}
- run: npm run --if-present release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
82 changes: 0 additions & 82 deletions .github/workflows/main.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Close and mark stale issue

on:
schedule:
- cron: '0 0 * * *'

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'Oops, seems like we needed more information for this issue, please comment with more details or this issue will be closed in 7 days.'
close-issue-message: 'This issue was closed because it is missing author input.'
stale-issue-label: 'kind/stale'
any-of-labels: 'need/author-input'
exempt-issue-labels: 'need/triage,need/community-input,need/maintainer-input,need/maintainers-input,need/analysis,status/blocked,status/in-progress,status/ready,status/deferred,status/inactive'
days-before-issue-stale: 6
days-before-issue-close: 7
enable-statistics: true
52 changes: 49 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,52 @@
## [12.0.2](https://github.com/ipfs/js-ipfsd-ctl/compare/v12.0.1...v12.0.2) (2022-09-02)


### Bug Fixes

* make sure to behave as node.js in electron main process ([#761](https://github.com/ipfs/js-ipfsd-ctl/issues/761)) ([9492643](https://github.com/ipfs/js-ipfsd-ctl/commit/949264360020b6d45ae585a62d6ea8ca550ca0e4)), closes [#760](https://github.com/ipfs/js-ipfsd-ctl/issues/760)

## [12.0.1](https://github.com/ipfs/js-ipfsd-ctl/compare/v12.0.0...v12.0.1) (2022-09-01)


### Trivial Changes

* Update .github/workflows/stale.yml [skip ci] ([8bf29d3](https://github.com/ipfs/js-ipfsd-ctl/commit/8bf29d341897a2c0660e6b0e47ce8c93e9abbb69))
* update project config ([#768](https://github.com/ipfs/js-ipfsd-ctl/issues/768)) ([29c44cb](https://github.com/ipfs/js-ipfsd-ctl/commit/29c44cb0b83c97f40e77775e8ddb7772260dddaa))


### Dependencies

* bump wherearewe from 1.0.2 to 2.0.1 ([#762](https://github.com/ipfs/js-ipfsd-ctl/issues/762)) ([7423b90](https://github.com/ipfs/js-ipfsd-ctl/commit/7423b90f69c6a77c4d2eb9095cb2774ccfc80bc0))

## [12.0.0](https://github.com/ipfs/js-ipfsd-ctl/compare/v11.0.1...v12.0.0) (2022-06-28)


### ⚠ BREAKING CHANGES

* pulls in new peer-id interface

### Features

* update deps ([#756](https://github.com/ipfs/js-ipfsd-ctl/issues/756)) ([1355786](https://github.com/ipfs/js-ipfsd-ctl/commit/13557866c8c7b84c7887f6baf6fdd41324d74725))

### [11.0.1](https://github.com/ipfs/js-ipfsd-ctl/compare/v11.0.0...v11.0.1) (2022-05-25)


### Trivial Changes

* bump @libp2p/interfaces from 1.3.32 to 2.0.2 ([#734](https://github.com/ipfs/js-ipfsd-ctl/issues/734)) ([cc91981](https://github.com/ipfs/js-ipfsd-ctl/commit/cc91981e5607b6653fb4388698945431d80aadcb))

## [11.0.0](https://github.com/ipfs/js-ipfsd-ctl/compare/v10.0.6...v11.0.0) (2022-05-09)


### ⚠ BREAKING CHANGES

* the `controller.api.peerId` property is now at `controller.peer`

### Features

* convert to ESM ([#731](https://github.com/ipfs/js-ipfsd-ctl/issues/731)) ([c6ad54d](https://github.com/ipfs/js-ipfsd-ctl/commit/c6ad54d62a2f6425a232152db0bfac75a7aa7a8c))

## [10.0.6](https://github.com/ipfs/js-ipfsd-ctl/compare/v10.0.5...v10.0.6) (2022-02-22)


Expand Down Expand Up @@ -1355,6 +1404,3 @@ Same as js-ipfs constructor https://github.com/ipfs/js-ipfs#ipfs-constructor

<a name="0.4.1"></a>
## 0.4.1 (2015-09-18)



Loading

0 comments on commit a278d5e

Please sign in to comment.