Skip to content

Commit

Permalink
Merge branch 'master' into replace-hashcorp-putty
Browse files Browse the repository at this point in the history
  • Loading branch information
MattTheCuber committed Jan 2, 2025
2 parents 11fa9c6 + a025a3c commit bb9961e
Show file tree
Hide file tree
Showing 14 changed files with 4,196 additions and 3,815 deletions.
91 changes: 91 additions & 0 deletions .github/workflows/validate-test-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
name: Validate, Test, and Update

on:
push:
branches:
- master
pull_request:
branches:
- master
schedule:
- cron: "45 1 * * *"

jobs:
validate-projects-yaml:
runs-on: ubuntu-latest
steps:
- name: Check out the code
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.12

- name: Install dependencies
run: pip install -r requirements.txt

- name: Validate projects YAML file
run: python -u tools/check_projects_yaml.py

test-chert:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: 3.12

- name: Install dependencies
run: pip install -r requirements.txt

- name: Render site
run: |
output=$(chert render 2>&1)
echo "$output"
if echo "$output" | grep -q "^E+"; then
exit 1
fi
update-and-deploy:
if: github.ref == 'refs/heads/master'
needs:
- validate-projects-yaml
- test-chert
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}

- uses: actions/setup-python@v5
with:
python-version: 3.12

- name: Install dependencies
run: pip install -r requirements.txt

- name: Generate updated projects.json file
env:
GH_USER: github-actions[bot]
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: python -u tools/gen_projects_json.py

- name: Test render site
run: |
output=$(chert render 2>&1)
echo "$output"
if echo "$output" | grep -q "^E+"; then
exit 1
fi
- name: Commit and Push Changes
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git add projects.json
git commit -m "chore: update project.json [skip ci]"
git push origin master
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Chert ignores

# Ignore generated files. Remove this line if you want to check them in.
site/*
site/

# Ignore compiled Python in the top-level directory (where custom.py lives)
*.py[co]
Expand All @@ -13,3 +13,10 @@ site/*
._*
.\#*
\#*\#

.env
test.ipynb
gh_token
gh-token
github_token
github-token
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

41 changes: 20 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
BSD 3-Clause License

Copyright (c) 2018, Mahmoud Hashemi and contributors

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* The names of the contributors may not be used to endorse or
promote products derived from this software without specific
prior written permission.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading

0 comments on commit bb9961e

Please sign in to comment.