Skip to content

Commit

Permalink
Merge branch 'main' into 546-https-support
Browse files Browse the repository at this point in the history
  • Loading branch information
JamieSlome authored Jun 5, 2024
2 parents 6d58cc4 + bf7c94d commit 6c4210d
Show file tree
Hide file tree
Showing 14 changed files with 1,698 additions and 1,556 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
mongodb-version: [4.4]

steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
fetch-depth: 0

Expand All @@ -33,7 +33,7 @@ jobs:
node-version: ${{ matrix.node-version }}

- name: Start MongoDB
uses: supercharge/mongodb-github-action@v1.10.0
uses: supercharge/mongodb-github-action@1.11.0
with:
mongodb-version: ${{ matrix.mongodb-version }}

Expand All @@ -47,7 +47,7 @@ jobs:
npm run test-coverage-ci --workspaces --if-present
- name: Upload test coverage report
uses: codecov/codecov-action@v4.3.1
uses: codecov/codecov-action@v4.4.1
with:
files: ./coverage/lcov.info
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cve-scanning-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
node-version: ${{ env.NODE_VERSION }}

- name: Code Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
with:
fetch-depth: 0

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v4
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
- run: npm ci
- run: npm run build
- run: npm publish --access=public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
114 changes: 57 additions & 57 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
---
name: Release
# ---
# name: Release

on:
workflow_dispatch:
push:
branches:
- main
paths:
- 'src/**'
- 'test/**'
- 'scripts/**'
- 'public/**'
- 'packages/**'
- 'package.json'
- 'package-lock.json'
# on:
# workflow_dispatch:
# push:
# branches:
# - main
# paths:
# - 'src/**'
# - 'test/**'
# - 'scripts/**'
# - 'public/**'
# - 'packages/**'
# - 'package.json'
# - 'package-lock.json'

permissions:
contents: read
# permissions:
# contents: read

jobs:
create_github_release:
outputs:
full-tag: ${{ steps.release-drafter.outputs.tag_name }}
short-tag: ${{ steps.get_tag_name.outputs.SHORT_TAG }}
body: ${{ steps.release-drafter.outputs.body }}
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: read
steps:
- uses: release-drafter/release-drafter@v6
id: release-drafter
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
publish: true
- name: Get the short tag
id: get_tag_name
run: |
short_tag=$(echo ${{ steps.release-drafter.outputs.tag_name }} | cut -d. -f1)
echo "SHORT_TAG=$short_tag" >> $GITHUB_OUTPUT
create_npm_release:
needs: create_github_release
runs-on: ubuntu-latest
permissions:
packages: write
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
steps:
- uses: actions/checkout@8459bc0 # v4
- uses: actions/setup-node@c2ac33f # v4, Setup .npmrc file to publish to npm
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
- run: npm ci
- run: npm publish --access=public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
# jobs:
# create_github_release:
# outputs:
# full-tag: ${{ steps.release-drafter.outputs.tag_name }}
# short-tag: ${{ steps.get_tag_name.outputs.SHORT_TAG }}
# body: ${{ steps.release-drafter.outputs.body }}
# runs-on: ubuntu-latest
# permissions:
# contents: write
# pull-requests: read
# steps:
# - uses: release-drafter/release-drafter@v6
# id: release-drafter
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# publish: true
# - name: Get the short tag
# id: get_tag_name
# run: |
# short_tag=$(echo ${{ steps.release-drafter.outputs.tag_name }} | cut -d. -f1)
# echo "SHORT_TAG=$short_tag" >> $GITHUB_OUTPUT
# create_npm_release:
# needs: create_github_release
# runs-on: ubuntu-latest
# permissions:
# packages: write
# env:
# REGISTRY: ghcr.io
# IMAGE_NAME: ${{ github.repository }}
# steps:
# - uses: actions/checkout@8459bc0 # v4
# - uses: actions/setup-node@c2ac33f # v4, Setup .npmrc file to publish to npm
# with:
# node-version: '18.x'
# registry-url: 'https://registry.npmjs.org'
# - run: npm ci
# - run: npm publish --access=public
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file required to override .gitignore when publishing to npm
Loading

0 comments on commit 6c4210d

Please sign in to comment.