Skip to content

Commit

Permalink
Merge branch 'documentation' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hanjoosten committed Oct 15, 2024
2 parents 06bae2c + 61af356 commit fadaf39
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 35 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build-and-test-docker:
name: Build with Docker
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
DOCKER_AMPERSAND_IMAGE: ampersandtarski/ampersand
steps:
Expand All @@ -36,8 +36,8 @@ jobs:
run: docker push ${DOCKER_AMPERSAND_IMAGE}:latest

build-and-test-ubuntu:
name: Build and test on ubuntu-latest 🏗 🧪
runs-on: ubuntu-latest
name: Build and test on ubuntu-22.04 🏗 🧪
runs-on: ubuntu-22.04
steps:
- name: Checkout project contents 📡
uses: actions/checkout@v4
Expand All @@ -54,7 +54,7 @@ jobs:

build-and-test-macOS:
name: Build and test on macOS 🏗 🧪
runs-on: macos-12
runs-on: macos-13
steps:
- name: Checkout project contents 📡
uses: actions/checkout@v4
Expand All @@ -72,7 +72,7 @@ jobs:

build-and-test-windows:
name: Build and test on Windows 🏗 🧪
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout project contents 📡
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeQuality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
hlint:
name: Hlint - Check for code sanity
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout project contents 📡
uses: actions/checkout@v4
Expand All @@ -19,7 +19,7 @@ jobs:
uses: rwe/[email protected]
weeder:
name: Weeder - Check dead code
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout project contents 📡
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ name: Hadolint

on:
push:
branches: [ "main", master-v3x ]
branches: ["main", master-v3x]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
branches: ["main"]
schedule:
- cron: '21 14 * * 1'
- cron: "21 14 * * 1"

permissions:
contents: read

jobs:
hadolint:
name: Run hadolint scanning
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ormolu-formatting-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
# Enforces the use of ormolu formatting of each Haskell file on every pull request
ormolu:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# The checkout step is needed since the enforcer relies on local git commands
- uses: actions/checkout@v4
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
add-release-notes:
name: Add release notes to artefacts
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand All @@ -25,7 +25,7 @@ jobs:

docker-hub:
name: Build push image to DockerHub
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Docker meta
id: meta
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
build-without-test-macOS,
build-without-test-windows,
]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Download artifacts (Linux)
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -146,8 +146,8 @@ jobs:
asset_content_type: application/zip

build-without-test-ubuntu:
name: Build without test on ubuntu-latest 🏗 🧪
runs-on: ubuntu-latest
name: Build without test on ubuntu-22.04 🏗 🧪
runs-on: ubuntu-22.04
steps:
- name: Checkout project contents 📡
uses: actions/checkout@v4
Expand All @@ -169,7 +169,7 @@ jobs:

build-without-test-macOS:
name: Build without test on macOS 🏗 🧪
runs-on: macos-12
runs-on: macos-13
steps:
- name: Checkout project contents 📡
uses: actions/checkout@v4
Expand All @@ -194,7 +194,7 @@ jobs:

build-without-test-windows:
name: build without test on Windows 🏗 🧪
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout project contents 📡
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releasenotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
# Enforces the update of a changelog file on every pull request
changelog:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# The checkout step is needed since the enforcer relies on local git commands
- uses: actions/checkout@v4
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/stale-issues.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# The purpose of this job is to close stale issues and pull requests when
# there has been no activity on them at all for some period of time. First,
# a warning is given that the issue will be closed. If noone reacts, then
# the issue will be automatically closed.
# a warning is given that the issue will be closed. If noone reacts, then
# the issue will be automatically closed.
#
# The motivations behind this is the idea that each open issue has a maintenance
# cost. Even if nothing happens, every now and then open issues are browsed to
# cost. Even if nothing happens, every now and then open issues are browsed to
# see if something can be done. If there are a lot of open issues, looking through
# them obviously costs more time and brainpower. Closing them automatically after
# some time will weed out issues that have hardely any chance (if at all) of getting done.
# some time will weed out issues that have hardely any chance (if at all) of getting done.
#
# Documentation: https://github.com/marketplace/actions/close-stale-issues
#
name: 'Close stale issues and PRs'
name: "Close stale issues and PRs"
on:
schedule:
- cron: '30 1 * * *'
- cron: "30 1 * * *"

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/stale@v6
with:
stale-issue-message: 'This issue is stale because it has been open 5 years with no activity. Remove stale label or comment or this will be closed in 30 days.'
stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.'
close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
stale-issue-message: "This issue is stale because it has been open 5 years with no activity. Remove stale label or comment or this will be closed in 30 days."
stale-pr-message: "This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days."
close-issue-message: "This issue was closed because it has been stalled for 30 days with no activity."
days-before-stale: 1825 # (5 years)
days-before-close: 30
days-before-close: 30
2 changes: 1 addition & 1 deletion .github/workflows/triggerDocsUpdate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# Trigger the "DeployToPages" workflow in the "AmpersandTarski.github.io" repository
- run: |
Expand Down
3 changes: 1 addition & 2 deletions docs/the-tools-we-use/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ We maintain and use the following repositories at Github:
| [Ampersand-Language-Support](https://github.com/AmpersandTarski/Ampersand-Language-Support) | contains language support for VS-code, such as syntax coloring, code snippets, and the like. |
| \*\*\*\*[Publications](https://github.com/AmpersandTarski/Publications) | This repo is meant for collaborative writing of journal and conference papers about Ampersand. |
| [Prototype](https://github.com/AmpersandTarski/Prototype) | contains JavaScript source code of the prototype front-end and back-end generators and runtime code. |
| [documentation](https://github.com/AmpersandTarski/documentation) | contains the source code of the old documentation of Ampersand on GitBook. This is deprecated, because we use Github Pages to deploy our Docusaurus site. |
| [Docusaurus](https://github.com/AmpersandTarski/AmpersandTarski.github.io) | contains the source code of the documentation and the code to deploy it. |
| [AmpersandTarski.github.io](https://github.com/AmpersandTarski/AmpersandTarski.github.io) | contains the source code of the documentation and the code to deploy it. |
| [RAP](https://github.com/AmpersandTarski/RAP) | contains the source code of RAP, a tool that lets you analyse Ampersand models, generate functional specifications and make prototypes of information systems. It is the primary tool for students of the Open University of the Netherlands in the course Rule Based Design. |
| [MirrorMe](https://github.com/AmpersandTarski/MirrorMe) | contains the source code for an argument assistance system. It is based on defeasible reasoning along the lines of Toulmin and Hohfeld. |
| [webFiles](https://github.com/AmpersandTarski/webFiles) | contains all kind of consolidated documents that are related to Ampersand in some way. They are stored here to ensure that we have stable URLs to these documents, so we can hyperlink to them wherever appropriate |
Expand Down
2 changes: 1 addition & 1 deletion testing/Travis/testcases/tutorial/MyModel.adl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- This model is used at
-- https://ampersandtarski.gitbook.io/documentation/installing-ampersand/installing-the-tools-manually#test-to-see-if-you-can-build-your-first-prototype
-- https://ampersandtarski.github.io/ampersand/guides/installing-ampersand#test-to-see-if-you-can-build-your-first-prototype

CONTEXT HelloWorld IN ENGLISH
PURPOSE CONTEXT HelloWorld
Expand Down

0 comments on commit fadaf39

Please sign in to comment.