Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/builtkit-su…
Browse files Browse the repository at this point in the history
…pport
  • Loading branch information
schummar committed Jun 19, 2024
2 parents 93ed6d7 + aadd5d8 commit 797d250
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 45 deletions.
38 changes: 2 additions & 36 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,48 +36,14 @@ jobs:
- name: NPM install
run: npm install

- name: Internal Tests
- name: NPM test
run: npm test

- name: Dockerode Tests
- name: Dockerode test suite
run: |
cd ../dockerode
rm -rf ./node_modules/docker-modem
pwd
ls ../
cp -R ../docker-modem ./node_modules/docker-modem
npm test
build_bun:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: oven-sh/setup-bun@v1

- name: Provisioning
run: |
docker --version
bun -v
docker pull ubuntu
pwd
cd ../
git clone --depth=50 --branch=master https://github.com/apocas/dockerode.git
cd dockerode
bun install
cd ../docker-modem
- name: Bun install
run: bun install

- name: Internal Tests
run: bun run test

- name: Dockerode Tests
run: |
cd ../dockerode
rm -rf ./node_modules/docker-modem
pwd
ls ../
cp -R ../docker-modem ./node_modules/docker-modem
bun run test
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions test/modem_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ describe('Modem', function () {

var modem = new Modem();
assert.ok(modem.socketPath);
assert.strictEqual(modem.host, undefined);
assert.strictEqual(modem.socketPath, '/tmp/docker.sock');
});

Expand Down

0 comments on commit 797d250

Please sign in to comment.