Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
11 changes: 11 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
"changelog": "@changesets/changelog-github",
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
}
5 changes: 5 additions & 0 deletions .changeset/tough-onions-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"cloudflared": minor
---

Update the output parser to cloudflared 2023.8.2
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
uses: actions/checkout@v3

- name: Setup PNPM
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v2.4.0
with:
version: latest
run_install: true

- name: Build Docs
run: pnpm i && pnpm run docs
run: pnpm run docs

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
Expand Down
66 changes: 17 additions & 49 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,62 +10,30 @@ jobs:
release-npm:
name: Release NPM (${{ github.ref }})
runs-on: ubuntu-latest
permissions:
contents: write
issues: write
pull-requests: write
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Check if Tag on Main
run: |
git checkout main
branch=$(git branch main --contains ${{ github.ref }})
git checkout ${{ github.ref }}
if [ -z $branch ]; then
echo "Tag ${{ github.ref }} is not contained in the main branch."
exit 1
fi

- name: Setup PNPM
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v2.4.0
with:
version: latest
run_install: true

- name: Build & Test
run: pnpm build && pnpm test

- name: Publish
run: |
pnpm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
pnpm publish --verbose --no-git-checks

release-note:
name: Release Note (${{ github.ref }})
runs-on: ubuntu-latest
needs:
- release-npm
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Check if Tag on Main
run: |
git checkout main
branch=$(git branch main --contains ${{ github.ref }})
git checkout ${{ github.ref }}
if [ -z $branch ]; then
echo "Tag ${{ github.ref }} is not contained in the main branch."
exit 1
fi
- name: Build
run: pnpm build

- name: Publish Release
uses: "marvinpinto/action-automatic-releases@latest"
- name: Create Release Pull Request or Publish to NPM
id: changesets
uses: changesets/action@v1
with:
repo_token: "${{ secrets.GH_TOKEN }}"
prerelease: false
files: |
README.md
LICENSE
publish: pnpm changeset publish
version: pnpm changeset version
title: Release Packages
commit: bump versions
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ jobs:
uses: actions/checkout@v3

- name: Setup PNPM
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v2.4.0
with:
version: latest
run_install: true

- name: Build
run: pnpm i && pnpm build
run: pnpm build

- name: Test (w/ service)
run: sudo -E $PNPM_HOME/pnpm test
Expand Down
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"docs": "typedoc ./src/lib.ts",
"format": "prettier --write '**/*.{js,ts,jsx,tsx,json,yml,yaml,md,html}' --ignore-path .gitignore",
"lint": "eslint .",
"postinstall": "node scripts/postinstall.mjs && node lib/cloudflared.js -v"
"postinstall": "node scripts/postinstall.mjs && node lib/cloudflared.js -v",
"changeset": "changeset"
},
"keywords": [
"cloudflared",
Expand All @@ -30,9 +31,12 @@
"scripts"
],
"devDependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.2",
"@types/node": "^18.0.6",
"@typescript-eslint/eslint-plugin": "^5.30.7",
"@typescript-eslint/parser": "^5.30.7",
"changeset": "^0.2.6",
"cloudflared": "workspace:*",
"eslint": "^8.20.0",
"eslint-config-prettier": "^8.5.0",
Expand All @@ -49,5 +53,6 @@
},
"bugs": {
"url": "https://github.com/JacobLinCool/node-cloudflared/issues"
}
},
"packageManager": "pnpm@8.7.5"
}
Loading