Skip to content

Commit 305e71b

Browse files
committed
Merge branch 'master' into user/garywilb/threaded_consume_2
2 parents c8027f4 + 52b40e9 commit 305e71b

File tree

8 files changed

+3100
-75
lines changed

8 files changed

+3100
-75
lines changed

.github/workflows/npm-publish.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
3+
4+
name: Publish node-rdkafka
5+
6+
on:
7+
release:
8+
types: [created]
9+
10+
jobs:
11+
publish-npm:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
submodules: recursive
17+
- uses: actions/setup-node@v3
18+
with:
19+
node-version: 10
20+
registry-url: https://registry.npmjs.org/
21+
cache: 'npm'
22+
- run: npm ci
23+
- run: npm publish
24+
env:
25+
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/test.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
3+
4+
name: Test node-rdkafka
5+
6+
on:
7+
push:
8+
branches: [ "master" ]
9+
pull_request:
10+
branches: [ "master" ]
11+
12+
jobs:
13+
build:
14+
strategy:
15+
matrix:
16+
# 8, 10, 12, 14, 15, 16
17+
version: [12]
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v3
21+
with:
22+
submodules: recursive
23+
- uses: actions/setup-node@v3
24+
with:
25+
node-version: ${{ matrix.version }}
26+
cache: 'npm'
27+
- run: npm ci
28+
- run: npm test
29+
name: test

.travis.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Copyright (c) 2016 Blizzard Entertainment.
55

66
[https://github.com/blizzard/node-rdkafka](https://github.com/blizzard/node-rdkafka)
77

8-
[![Build Status](https://app.travis-ci.com/Blizzard/node-rdkafka.svg?branch=master)](https://app.travis-ci.com/github/Blizzard/node-rdkafka)
8+
[![Build Status](https://github.com/Blizzard/node-rdkafka/actions/workflows/test.yml/badge.svg)](https://github.com/Blizzard/node-rdkafka/actions/workflows/test.yml)
9+
910
[![npm version](https://badge.fury.io/js/node-rdkafka.svg)](https://badge.fury.io/js/node-rdkafka)
1011

1112
# Looking for Collaborators!
@@ -62,7 +63,7 @@ Using Alpine Linux? Check out the [docs](https://github.com/Blizzard/node-rdkafk
6263
Windows build **is not** compiled from `librdkafka` source but it is rather linked against the appropriate version of [NuGet librdkafka.redist](https://www.nuget.org/packages/librdkafka.redist/) static binary that gets downloaded from `https://globalcdn.nuget.org/packages/librdkafka.redist.1.9.2.nupkg` during installation. This download link can be changed using the environment variable `NODE_RDKAFKA_NUGET_BASE_URL` that defaults to `https://globalcdn.nuget.org/packages/` when it's no set.
6364

6465
Requirements:
65-
* [node-gyp for Windows](https://github.com/nodejs/node-gyp#on-windows) (the easies way to get it: `npm install --global --production windows-build-tools`, if your node version is 6.x or below, pleasse use `npm install --global --production [email protected]`)
66+
* [node-gyp for Windows](https://github.com/nodejs/node-gyp#on-windows) (the easies way to get it: `npm install --global --production windows-build-tools`, if your node version is 6.x or below, please use `npm install --global --production [email protected]`)
6667

6768
**Note:** I _still_ do not recommend using `node-rdkafka` in production on Windows. This feature was in high demand and is provided to help develop, but we do not test against Windows, and windows support may lag behind Linux/Mac support because those platforms are the ones used to develop this library. Contributors are welcome if any Windows issues are found :)
6869

examples/docker-alpine.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ When using docker to install `node-rdkafka`, you need to make sure you install a
33
You can see some of the differences here: https://linuxacademy.com/blog/cloud/alpine-linux-and-docker/
44

55
```dockerfile
6-
FROM node:8-alpine
6+
FROM node:14-alpine
77

88
RUN apk --no-cache add \
99
bash \
@@ -14,7 +14,7 @@ RUN apk --no-cache add \
1414
cyrus-sasl-dev \
1515
openssl-dev \
1616
make \
17-
python
17+
python3
1818

1919
RUN apk add --no-cache --virtual .build-deps gcc zlib-dev libc-dev bsd-compat-headers py-setuptools bash
2020

0 commit comments

Comments
 (0)