Skip to content

Commit

Permalink
chore: Update version/2.x.x (#369)
Browse files Browse the repository at this point in the history
* ✨ feature/pipelines (#352)

* feat: Run dependabot against develop and version/2.x.x

* feat: Run CodeQL against develop and version/2.x.x

* refactor: Consolidate test pipeline, run against develop and version/2.x.x

* chore: Update readme with new branch URLs (#364)

* feat: Group all dependabot updates per branch (#365)

* chore: Adjust branch params, update action version (#368)
  • Loading branch information
CookieCookson authored Dec 14, 2023
1 parent 6d0e6f0 commit 11154f6
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 80 deletions.
29 changes: 22 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2

updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: "npm"
directory: /
target-branch: develop
schedule:
interval: "monthly"
groups:
all-deps:
update-types:
- "major"
- "minor"
- "patch"

- package-ecosystem: "npm"
directory: /
target-branch: version/2.x.x
schedule:
interval: "monthly"
groups:
all-deps:
update-types:
- "major"
- "minor"
- "patch"
10 changes: 7 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ name: "CodeQL"

on:
push:
branches: [master]
branches:
- 'develop'
- 'version/2.x.x'
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches:
- 'develop'
- 'version/2.x.x'
schedule:
- cron: '0 3 * * 3'

Expand All @@ -30,7 +34,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/test-pr.yml

This file was deleted.

38 changes: 0 additions & 38 deletions .github/workflows/test-push-to-master.yml

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Test

on:
push:
branches:
- 'develop'
- 'version/2.x.x'
pull_request:
branches:
- 'develop'
- 'version/2.x.x'

jobs:
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Use Node.js 18
uses: actions/setup-node@v4
with:
node-version: 18

- name: Install Dependencies
run: npm ci

- name: Prettier
run: npm run test:format

- name: ESLint
run: npm run lint

- name: Build
run: npm run build --if-present

- name: Test
run: npm run test
env:
CI: true
LRS_CREDENTIALS_ARRAY: ${{ secrets.LRS_CREDENTIALS_ARRAY }}

- name: Coverage
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<!-- prettier-ignore -->
[![npm version](https://img.shields.io/npm/v/@xapi/xapi.svg)](https://www.npmjs.com/package/@xapi/xapi) [![Test](https://github.com/xapijs/xapi/workflows/Test/badge.svg)](https://github.com/xapijs/xapi/actions/workflows/test-push-to-master.yml) [![Coverage Status](https://coveralls.io/repos/github/xapijs/xapi/badge.svg?branch=master)](https://coveralls.io/github/xapijs/xapi?branch=master) [![Maintainability](https://api.codeclimate.com/v1/badges/93dd4331b1fe39ab73d7/maintainability)](https://codeclimate.com/github/xapijs/xapi/maintainability) ![minified size](https://img.shields.io/bundlephobia/min/@xapi/xapi) ![minzipped size](https://img.shields.io/bundlephobia/minzip/@xapi/xapi)
[![npm version](https://img.shields.io/npm/v/@xapi/xapi.svg)](https://www.npmjs.com/package/@xapi/xapi)
[![test](https://github.com/xapijs/xapi/actions/workflows/test.yml/badge.svg?branch=develop)](https://github.com/xapijs/xapi/actions/workflows/test.yml)
[![Coverage Status](https://coveralls.io/repos/github/xapijs/xapi/badge.svg?branch=develop)](https://coveralls.io/github/xapijs/xapi?branch=develop)
[![maintainability](https://api.codeclimate.com/v1/badges/93dd4331b1fe39ab73d7/maintainability)](https://codeclimate.com/github/xapijs/xapi/maintainability)
![minified size](https://img.shields.io/bundlephobia/min/@xapi/xapi)
![minzipped size](https://img.shields.io/bundlephobia/minzip/@xapi/xapi)

[<img width="100" src="https://avatars3.githubusercontent.com/u/65084607?s=200&v=4" alt="xAPI.js logo">](https://www.xapijs.dev)

Expand Down

0 comments on commit 11154f6

Please sign in to comment.