Skip to content

Commit

Permalink
Merge pull request #53 from iambumblehead/change-to-main
Browse files Browse the repository at this point in the history
switch to master branch
  • Loading branch information
iambumblehead authored Sep 24, 2023
2 parents d7f59e2 + 55bf321 commit 1885639
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 48 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
name: nodejs-lint
name: lint

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: lint
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: '20.x'
- run: npm install
- run: npm run lint
30 changes: 0 additions & 30 deletions .github/workflows/node.js.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages

name: Node.js Package
name: publish

on:
release:
Expand All @@ -11,12 +8,13 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
- run: npm install
- run: npm test
- run: npm run build --if-present
- run: npm run test

# publish-npm:
# needs: build
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: tests

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 20
- run: npm install
- run: npm run build --if-present
- run: npm test
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 6.1.4 - 2023-09-24

* [switch primary branch to 'main'](https://github.com/iambumblehead/form-urlencoded/pull/53)

## 6.1.3 - 2023-09-11

* [fix types file](https://github.com/iambumblehead/form-urlencoded/pull/51)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ console.log(formurlencoded(obj, {
[7]: https://raw.githubusercontent.com/iambumblehead/es5classic/master/es5classic_120x120.png


![scrounge](https://github.com/iambumblehead/scroungejs/raw/master/img/hand.png)
![scrounge](https://github.com/iambumblehead/scroungejs/raw/main/img/hand.png)


(The MIT License)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"require": "./form-urlencoded.js",
"import": "./form-urlencoded.mjs"
},
"version": "6.1.3",
"version": "6.1.4",
"description": "Return an object as an 'x-www-form-urlencoded' string",
"author": "Chris <chris@bumblehead.com>",
"license": "MIT",
Expand Down

0 comments on commit 1885639

Please sign in to comment.