diff --git a/.forgejo/workflows/publish.yml b/.github/workflows/publish.yml similarity index 84% rename from .forgejo/workflows/publish.yml rename to .github/workflows/publish.yml index d277eb4..082ef9b 100644 --- a/.forgejo/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,13 +7,17 @@ on: jobs: publish: - runs-on: default + runs-on: ubuntu-latest steps: # Checkout the repository - name: Checkout code uses: actions/checkout@v3 + # Set up NPM Auth Token + - name: Set up NPM Auth Token + run: echo "NODE_AUTH_TOKEN=${{ secrets.NPM_TOKEN }}" >> $GITHUB_ENV + # Set up NPM Auth Token - name: Set up NPM Auth Token run: echo "NODE_AUTH_TOKEN=${{ secrets.NPM_TOKEN }}" >> $GITHUB_ENV @@ -73,18 +77,10 @@ jobs: - name: Commit Version Change (if needed) if: steps.version_check.outputs.version_changed == 'true' run: | - # Update remote URL to use the GITHUB_TOKEN for authentication - git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@git.bridgemanaccessible.ca/${{ github.repository }}.git - - # Setup git user details for committing the version change - git config user.name "Forgejo Actions" - git config user.email "actions@git.bridgemanaccessible.ca" - - # Commit the version change to the `package.json` file + git config user.name "GitHub Actions" + git config user.email "actions@github.com" git add package.json - git commit -m "[Forgejo Actions] Update version to ${{ env.new_version }}" - - # Push the changes to the repository + git commit -m "[Github Actions] Update version to ${{ env.new_version }}" git push origin HEAD:main # Publish to private NPM registry diff --git a/package.json b/package.json index 0bd8d22..6c2d082 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@BridgemanAccessible/ba-web-framework", - "version": "1.0.10", + "version": "1.0.6", "description": "A framework for web apps built atop Node, Express and other libraries and utilties that makes creating and maintaining Bridgeman Accessible web apps easier.", "author": "Bridgeman Accessible { - console.log(`Adding outside framework route: ${route}`); app.getInitializer().getRouter().addOutsideFrameworkRoute(route); }); } diff --git a/src/controllers/index.ts b/src/controllers/index.ts index ee5ea83..a96f133 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -1,4 +1,3 @@ import { BaseController } from './BaseController'; -import { ErrorController } from './ErrorController'; -export { BaseController, ErrorController }; \ No newline at end of file +export { BaseController }; \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index f3775e0..f3214ad 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,15 +3,13 @@ import { Initializer } from './Initializer'; import { Router } from './Router'; import { Renderer } from './Renderer'; import { StaticFileResolver } from './StaticFileResolver'; -import { OAuthApp } from './OAuthApp'; export { App, Initializer, Router, Renderer, - StaticFileResolver, - OAuthApp + StaticFileResolver }; export * from './controllers'; export * from './decorators';