Skip to content

Commit

Permalink
Merge branch 'NET-542-brubeck-client-browser' into npm-workspaces
Browse files Browse the repository at this point in the history
* NET-542-brubeck-client-browser: (50 commits)
  Revert "Revert "Merge branch 'main' into NET-542-brubeck-client-browser""
  Revert "Revert "Merge branch 'main' into NET-542-brubeck-client-browser""
  style(client): fix eslint error
  Fix broken browser tests (#269)
  client [NET-571]: Using the Brubeck client without providing a private key (#268)
  ci: specify exact action versions for easy debugability (#266)
  ci(deps): bump actions/checkout from 2.3.5 to 2.4.0 (#271)
  docs(broker): fix mqtt example
  fix(broker): rely on default value for config.network.webrtcDisallowPrivateAddresses
  fix(broker): fix default value type in schema
  release: cli-tools 6.0.0-alpha.0
  fix: cli-tools work with alpha client
  test(network): fix describe
  Update README.md
  style(broker): break up log line
  ci(test-utils): replace styfle/cancel-workflow-action with GitHub Actions concurrency
  ci(protocol): replace styfle/cancel-workflow-action with GitHub Actions concurrency
  ci(network): replace styfle/cancel-workflow-action with GitHub Actions concurrency
  ci(client-dataunions): replace styfle/cancel-workflow-action with GitHub Actions concurrency
  ci(client-code): replace styfle/cancel-workflow-action with GitHub Actions concurrency
  ...
  • Loading branch information
timoxley committed Nov 9, 2021
2 parents 3c54a06 + 4c1bc51 commit af9df43
Show file tree
Hide file tree
Showing 127 changed files with 3,011 additions and 2,158 deletions.
53 changes: 27 additions & 26 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
---
test:
- '*test*'
ci:
- '.github/*'
- '.github/**/*'
- '.github/*'
- '.github/**/*'
docs:
- '**.md'
- '*.md'
- '**.md'
- '*.md'
broker:
- 'packages/broker/*'
- 'packages/broker/**/*'
- '.github/workflows/broker.yml'
- 'packages/broker/*'
- 'packages/broker/**/*'
- '.github/workflows/broker.yml'
network:
- 'packages/network/*'
- 'packages/network/**/*'
- '.github/workflows/network.yml'
- 'packages/network/*'
- 'packages/network/**/*'
- '.github/workflows/network.yml'
client:
- 'packages/client/*'
- 'packages/client/**/*'
- '.github/workflows/client-build.yml'
- '.github/workflows/client-code.yml'
- 'packages/client/*'
- 'packages/client/**/*'
- '.github/workflows/client-build.yml'
- '.github/workflows/client-code.yml'
protocol:
- 'packages/protocol/*'
- 'packages/protocol/**/*'
- '.github/workflows/protocol.yml'
- 'packages/protocol/*'
- 'packages/protocol/**/*'
- '.github/workflows/protocol.yml'
test-utils:
- 'packages/test-utils/*'
- 'packages/test-utils/**/*'
- '.github/workflows/test-utils.yml'
- 'packages/test-utils/*'
- 'packages/test-utils/**/*'
- '.github/workflows/test-utils.yml'
cli-tools:
- 'packages/cli-tools/*'
- 'packages/cli-tools/**/*'
- 'packages/cli-tools/*'
- 'packages/cli-tools/**/*'
cross-client-testing:
- 'packages/cross-client-testing/*'
- 'packages/cross-client-testing/**/*'
- '.github/workflows/cross-client.yml'
- 'packages/cross-client-testing/*'
- 'packages/cross-client-testing/**/*'
- '.github/workflows/cross-client.yml'
dev-config:
- 'packages/dev-config/*'
- 'packages/dev-config/*'
84 changes: 37 additions & 47 deletions .github/workflows/broker.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: Broker – Lint, Test and Publish

on:
Expand All @@ -11,42 +12,31 @@ on:
- '*'
schedule:
# run every day at 00:00
- cron: '0 0 * * *'

- cron: '0 0 * * *'
concurrency:
group: broker-build-${{ github.head_ref }}
cancel-in-progress: true
defaults:
run:
working-directory: packages/broker

jobs:
init:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
all_but_latest: true
access_token: ${{ github.token }}
test-unit:
name: Unit Tests
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ 16.x ]
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.4.0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@v2.4.1
with:
node-version: ${{ matrix.node-version }}
- name: Cache Node.js modules
uses: actions/[email protected]
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.node-version }}
${{ runner.os }}-node-
${{ runner.os }}-
cache: 'npm'
cache-dependency-path: |
package-lock.json
packages/*/package-lock.json
- name: npm ci
working-directory: './'
run: |
Expand All @@ -61,20 +51,15 @@ jobs:
matrix:
node-version: [ 16.x ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2.4.0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v2.4.1
with:
node-version: ${{ matrix.node-version }}
- name: Cache Node.js modules
uses: actions/[email protected]
with:
path: ~/.npm
key: ${{ runner.OS }}-node-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-${{ matrix.node-version }}
${{ runner.OS }}-node-
${{ runner.OS }}-
cache: 'npm'
cache-dependency-path: |
package-lock.json
packages/*/package-lock.json
- name: npm ci
working-directory: './'
run: |
Expand All @@ -88,16 +73,21 @@ jobs:
env:
CI: true
LOG_LEVEL: warn
- name: Stop Streamr Docker Stack
if: always()
run: |
docker kill $(docker ps -q)
docker rm $(docker ps -a -q)
docker:
needs: [test-unit, test-integration]
name: Build, test, and publish Docker images
runs-on: ubuntu-latest
runs-on: self-hosted

# run job only for main and tags
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.4.0
- name: Cache Docker layers
uses: actions/[email protected]
with:
Expand Down Expand Up @@ -138,20 +128,26 @@ jobs:
fi;
done;
exit 1
- name: Stop Streamr Docker Stack
if: always()
run: |
docker kill $(docker ps -q)
docker rm $(docker ps -a -q)
- uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Docker meta
id: docker_meta
uses: docker/metadata-action@v3.5.0
uses: docker/metadata-action@v3.6.0
with:
images: streamr/broker-node
tags: |
type=sha
type=ref,event=branch
type=semver,pattern=v{{version}}
type=raw,value=dev
type=schedule,pattern=nightly
- name: Setup qemu
uses: docker/[email protected]
with:
Expand Down Expand Up @@ -186,21 +182,15 @@ jobs:
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}

- uses: actions/checkout@v2.3.4
- uses: actions/setup-node@v2.1.5
- uses: actions/checkout@v2.4.0
- uses: actions/setup-node@v2.4.1
with:
node-version: 16
registry-url: https://registry.npmjs.org/

- name: Cache Node.js modules
uses: actions/[email protected]
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.node-version }}
${{ runner.os }}-node-
${{ runner.os }}-
cache: 'npm'
cache-dependency-path: |
package-lock.json
packages/*/package-lock.json
- name: npm ci
working-directory: './'
Expand Down
Loading

0 comments on commit af9df43

Please sign in to comment.