Skip to content

Commit e1d597a

Browse files
Small Update (#312)
1 parent cde8c79 commit e1d597a

File tree

4 files changed

+16
-21
lines changed

4 files changed

+16
-21
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name: CI
1010

1111
on:
1212
pull_request:
13-
branches: ['main', 'source']
13+
branches: ['main']
1414

1515
env:
1616
NODE_CACHE_VERSION: 1

.github/workflows/deploy-to-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name: Deploy to GitHub Pages
1010

1111
on:
1212
push:
13-
branches: ["main", "source"]
13+
branches: ["main"]
1414
workflow_dispatch:
1515

1616
env:

.github/workflows/release-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v4
2222
with:
23-
ref: source
23+
ref: main
2424
fetch-depth: 0
2525

2626
- name: generate json files
@@ -40,7 +40,7 @@ jobs:
4040
# This is a gnarly command for updating an existing, or making a new PR
4141
# https://github.com/cli/cli/discussions/5792
4242
- name: Generate PR
43-
run: gh pr edit 'release-${{ github.event.inputs.version }}' -b '${{ env.PR_BODY }}' -t '${{ env.PR_TITLE }}' && (gh pr reopen '${{ env.BRANCH_NAME }}' || gh pr create --base source --fill --head 'release-${{ github.event.inputs.version }}')
43+
run: gh pr edit 'release-${{ github.event.inputs.version }}' -b '${{ env.PR_BODY }}' -t '${{ env.PR_TITLE }}' && (gh pr reopen '${{ env.BRANCH_NAME }}' || gh pr create --base main --fill --head 'release-${{ github.event.inputs.version }}')
4444
env:
4545
GH_TOKEN: ${{ github.token }}
4646

README.md

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
# Osquery Website
22

3-
## Running the app locally
3+
The osquery website was written in js some time ago. It is not under active develelopment, and parts may be getting quite flakey.
4+
5+
## Deployment & Hosting
6+
7+
The website is hosted on GitHub pages. It is deployed there using GitHub actions. As of 2025, this follows a normal github
8+
flow -- development on feature branches, PR to main. The deploy-to-pages happens on merge to main.
9+
10+
In front of GitHub Pages is AWS Cloudfront. This is in the `infra` account. We should probably migrate off it.
11+
12+
When debugging, be aware of a bit of a weirdness -- pages deploys to `https://osquery.github.io/osquery-site/` but that URL won't work, because several parts of the website generate absolute URLs rooted in `/`. This is okay behind the CDN though.
13+
14+
## Development / Running the app locally
415

516
Install all dependencies:
617

@@ -75,22 +86,6 @@ To upload a new community event, submit a PR adding a JSON file to the [communit
7586

7687
Additionally, please add the newly-added filename to the [manifest file](/src/data/community_events/manifest.js).
7788

78-
## Hosting & Deployment
79-
80-
The website is hosted on github pages, off of the `master` branch. It is developed on the `source` branch.
81-
82-
To deploy:
83-
84-
```shell
85-
cd .../osquery-site
86-
git checkout source
87-
git pull --rebase
88-
89-
yarn deploy
90-
```
91-
92-
This will create and push a commit to master with the update.
93-
9489
## License
9590

9691
This repository is licensed under the terms of the

0 commit comments

Comments
 (0)