Skip to content

Commit

Permalink
Merge pull request #258 from gaphor/pre-commit-hashed-versions
Browse files Browse the repository at this point in the history
  • Loading branch information
amolenaar authored Jan 12, 2025
2 parents ec78a80 + 5ea2f32 commit 3abc3ec
Show file tree
Hide file tree
Showing 18 changed files with 49 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ updates:
directory: "/"
schedule:
interval: "daily"

- package-ecosystem: "bundler"
directory: "/"
schedule:
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,33 @@ permissions:
contents: write

env:
python_version: '3.11'
python_version: '3.13'

jobs:
github-pages:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Harden Runner
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
with:
egress-policy: audit
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Lint with Pre-commit
uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
- name: Install Linux Dependencies
run: >
sudo apt-get update -qq && sudo apt-get install -qq --no-install-recommends po4a
- name: Set up Python
uses: actions/setup-python@v5.3.0
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: ${{ env.python_version }}
- name: Build translations
run: python po/build.py
- name: Set up Ruby
uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4 # v1.207.0
with:
ruby-version: 3.3.4
bundler-cache: true
- name: Build Pages
run: |
bundle install
Expand All @@ -40,10 +47,10 @@ jobs:
--disable-external true
--enforce-https false
--allow-missing-href true
--check-internal-hash false
--check-internal-hash false
--checks Links ./_site
- name: Deploy
uses: peaceiris/actions-gh-pages@v4
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
if: ${{ github.ref == 'refs/heads/main' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,25 @@ on:
types: [version-update]

permissions:
contents: write
contents: write
pull-requests: write

jobs:
update:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Harden Runner
uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
with:
egress-policy: audit

- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Update version
run: |
if test -z "${{ github.event.inputs.version }}${{ github.event.client_payload.version }}"; then echo "No version provided"; exit 1; fi
sed -i 's/^gaphor_version:.*$/gaphor_version: ${{ github.event.inputs.version }}${{ github.event.client_payload.version }}/' _config.yml
sed -i 's/^gaphor_version:.*$/gaphor_version: ${{ github.event.inputs.version }}${{ github.event.client_payload.version }}/' _config.yml
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
with:
commit-message: update to version ${{ github.event.inputs.version }}${{ github.event.client_payload.version }}
title: Update to version ${{ github.event.inputs.version }}${{ github.event.client_payload.version }}
Expand Down
10 changes: 10 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: 5494c3ed33bff63904f7e323281686480dc4eb98 # frozen: v8.22.1
hooks:
- id: gitleaks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gaphor.org
gaphor.org
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@

run:
docker run -it --rm -v "$$PWD":/usr/src/app:z -p "4000:4000" starefossen/github-pages



2 changes: 1 addition & 1 deletion _data/strings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ index:
latest-news-and-blog:
blog-content: |
Do you want to know what's going on with Gaphor? Read our blog!
[Contact the team](/discuss) if you want to share content related to Gaphor.
see-blog: See blog
read-more: Read more
Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

<div class="default-page">
{{ content }}
</div>
</div>
2 changes: 1 addition & 1 deletion _pages/blog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ layout: blog
title: Blog and News
lang: en
permalink: /blog/
---
---
4 changes: 2 additions & 2 deletions _posts/2020-11-27-simple-services-in-python.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ which is part of the Python standard library since Python 3.8. For older
versions (Python 3.6 and 3.7) a library
[`importlib_metadata`](https://pypi.org/project/importlib-metadata/) (notice
the underscore) can be used instead, providing the same
functionality. If you go back in history even more,
functionality. If you go back in history even more,
setuptools' [`pkg_resources`](https://setuptools.readthedocs.io/en/latest/pkg_resources.html)
was used to provide this functionality.

Expand All @@ -37,7 +37,7 @@ To view all entry points available in your python installation:
>>> import importlib.metadata
>>> for ep in importlib.metadata.entry_points():
... print(ep)
...
...
console_scripts
distutils.commands
distutils.setup_keywords
Expand Down
4 changes: 2 additions & 2 deletions _posts/2021-07-02-gaphor-2.5-highlights.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ support for STPA, a systems approach to safety engineering. Minor improvements
include the ability to move diagrams freely around in the tree view, and an extra
option to record notes on model elements.

The internal model used by Gaphor has been simplified.
The internal model used by Gaphor has been simplified.

Finally, we'll reflect on the changes made in Gaphor 2.3 and 2.4.

Expand Down Expand Up @@ -70,7 +70,7 @@ issue report helps make this application better. If you spot an issues, please

So, what happened with Gaphor 2.3 and 2.4. Well, quite a bit actually:

* Fault Tree Analysis has been added as part of RAAML
* Fault Tree Analysis has been added as part of RAAML
* C4 model support has been introduced in Gaphor 2.3.
* The UML model has been updated to UML 2.5 and has been extended by DataType,
ValueType, Primitive, and Enumeration. Containment has been added too.
Expand Down
2 changes: 1 addition & 1 deletion _posts/2022-12-10-gtk4-macos-keybindings.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ desktop applications. GTK 4 is the most recent major version, the long awaited
successor of GTK+ 3. For desktop applications there's a lot to gain by porting
to GTK 4. First and foremost because GTK 4 takes full support of your GPU.

For Gaphor we provide binaries for Linux, Windows and macOS.
For Gaphor we provide binaries for Linux, Windows and macOS.

GTK 4 no longer maps its keyboard shortcuts to macOS native keybindings. While
<kbd>Ctrl</kbd> is used on Linux and Windows, <kbd>Command</kbd> is used on
Expand Down
2 changes: 1 addition & 1 deletion _sass/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@media screen {
background-attachment: fixed;
}

// Safari on iOS does not support fixed backgrounds
// https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-touch-callout
@supports (-webkit-touch-callout: none) {
Expand Down
1 change: 0 additions & 1 deletion _sass/_languages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@
#header .language-header {
background-color: transparent;
}

2 changes: 1 addition & 1 deletion _usps/03-beginner-pro.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ icon: project-diagram
lang: en
---

Whether you're a casual modeler documenting a project or a Model Driven Development expert, Gaphor has got you covered.
Whether you're a casual modeler documenting a project or a Model Driven Development expert, Gaphor has got you covered.
2 changes: 1 addition & 1 deletion _usps/04-consistent.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ lang: en

UML is a graphical modeling language, so all information you put in the model
is visible in the diagrams. For example, stereotypes are modeled in diagrams.
No hidden panels and property pages. Just diagrams!
No hidden panels and property pages. Just diagrams!
2 changes: 1 addition & 1 deletion google2d5dfd6f795cd5fd.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-site-verification: google2d5dfd6f795cd5fd.html
google-site-verification: google2d5dfd6f795cd5fd.html
2 changes: 1 addition & 1 deletion images/matrix_org.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3abc3ec

Please sign in to comment.