Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #2

Merged
merged 22 commits into from
Dec 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c8418d3
chore(deps): update dependency eslint to v8
renovate-bot Oct 18, 2021
2153ee9
ci: Add CircleCI config (ENA-41)
Nov 16, 2022
ac0f98c
ci: Simplify with node orb
Nov 21, 2022
a6d400d
Revert "ci: Simplify with node orb"
Nov 21, 2022
50b7ade
Merge pull request #181 from LLK/circleci
Nov 23, 2022
3e1238c
chore(deps): update dependency babel-eslint to v10
renovate[bot] Mar 22, 2023
807a151
ci: gha workflow
skripted-io Oct 10, 2023
344b464
ci: gha workflow
skripted-io Oct 10, 2023
e66eace
ci: GHA migration - commented out cci config
skripted-io Oct 10, 2023
518f1b5
Merge pull request #202 from scratchfoundation/gha-migration
skripted-io Oct 13, 2023
bb19c1a
chore(deps): update dependency eslint-config-scratch to v9
renovate[bot] Dec 15, 2023
5e581f1
Merge branch 'renovate/babel-eslint-10.x' into renovate/eslint-config…
cwillisf Dec 15, 2023
bcfd307
Merge branch 'renovate/eslint-8.x' into renovate/eslint-config-scratc…
cwillisf Dec 15, 2023
068aca6
chore: lint fixes
cwillisf Dec 15, 2023
0b7a877
Merge pull request #182 from scratchfoundation/renovate/eslint-config…
cwillisf Dec 15, 2023
a2dfc67
ci: remove disabled CCI config
cwillisf Dec 21, 2023
46d4623
merge-upstream: Initial merge of upstream/develop
GarboMuffin Dec 23, 2023
203c6e9
merge-upstream: Update CI
GarboMuffin Dec 23, 2023
202ecf6
merge-upstream: Update CI
GarboMuffin Dec 25, 2023
fdd9aaa
merge-upstream: Always run build before publish
GarboMuffin Dec 25, 2023
40eca76
merge-upstream: Set "main" entry to dist.js as upstream does
GarboMuffin Dec 25, 2023
d653d81
merge-upstream: Update links in package.json
GarboMuffin Dec 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: 16.x
- run: npm ci
- run: npm run build
- run: npm run tap
- run: npm run test
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Development files
/.circleci

# Testing
/.nyc_output
/coverage
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v16
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A slightly modified drop-in replacement for scratch-audio.

#### Please note this project is at an early stage and we are not ready for pull requests

[![Build Status](https://travis-ci.org/LLK/scratch-audio.svg?branch=develop)](https://travis-ci.org/LLK/scratch-audio)
[![CircleCI](https://circleci.com/gh/LLK/scratch-audio/tree/develop.svg?style=shield&circle-token=3792f4f51158c8c9b448527466ffe302b0c6f0f5)](https://circleci.com/gh/LLK/scratch-audio?branch=develop)

## Installation
This requires you to have Git and Node.js installed.
Expand Down
Loading