Skip to content

Commit

Permalink
fix versions and formatting of actions (#321)
Browse files Browse the repository at this point in the history
  • Loading branch information
henrij22 authored Aug 29, 2024
1 parent 23f8b42 commit bc95a34
Show file tree
Hide file tree
Showing 11 changed files with 146 additions and 145 deletions.
68 changes: 34 additions & 34 deletions .github/workflows/createDockerContainer.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
# SPDX-FileCopyrightText: 2021-2024 The Ikarus Developers [email protected]
# SPDX-License-Identifier: CC0-1.0

name: Build Docker Images
name: Build Docker Images

on:
workflow_run:
workflows: ["Debian"]
branches: [main]
types:
- completed
workflow_dispatch:
on:
workflow_run:
workflows: ["Debian"]
branches: [main]
types:
- completed
workflow_dispatch:

jobs:
build-docker-debian:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: ubuntu-latest
jobs:
build-docker-debian:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
repository: 'ikarus-project/ikarus-docker-container'
path: 'repo'
- name: Build the Docker image
working-directory: ./repo/InstalledContainer
run: |
docker build . --file Dockerfile --tag ikarusproject/ikarus-gcc:latest --build-arg compiler="gcc" --build-arg ccompiler="gcc-12" --build-arg cppcompiler="g++-12"
docker build . --file Dockerfile --tag ikarusproject/ikarus-clang:latest --build-arg compiler="clang" --build-arg ccompiler="clang-16" --build-arg cppcompiler="clang++-16"
docker tag ikarusproject/ikarus-gcc:latest ikarusproject/ikarus:latest
- name: Docker Login
uses: azure/docker-login@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Publish the Docker image
working-directory: ./repo/InstalledContainer
run: |
docker push ikarusproject/ikarus-gcc:latest
docker push ikarusproject/ikarus-clang:latest
docker push ikarusproject/ikarus:latest
steps:
- uses: actions/checkout@v4
with:
repository: "ikarus-project/ikarus-docker-container"
path: "repo"
- name: Build the Docker image
working-directory: ./repo/InstalledContainer
run: |
docker build . --file Dockerfile --tag ikarusproject/ikarus-gcc:latest --build-arg compiler="gcc" --build-arg ccompiler="gcc-12" --build-arg cppcompiler="g++-12"
docker build . --file Dockerfile --tag ikarusproject/ikarus-clang:latest --build-arg compiler="clang" --build-arg ccompiler="clang-16" --build-arg cppcompiler="clang++-16"
docker tag ikarusproject/ikarus-gcc:latest ikarusproject/ikarus:latest
- name: Docker Login
uses: azure/docker-login@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Publish the Docker image
working-directory: ./repo/InstalledContainer
run: |
docker push ikarusproject/ikarus-gcc:latest
docker push ikarusproject/ikarus-clang:latest
docker push ikarusproject/ikarus:latest
28 changes: 14 additions & 14 deletions .github/workflows/createRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
inputs:
releaseTag:
description: 'Release version'
description: "Release version"
required: true

env:
Expand All @@ -23,9 +23,9 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
path: 'repo'
path: "repo"
token: ${{ secrets.ORGANIZATION_TOKEN }}
fetch-depth: '0'
fetch-depth: "0"
- name: Create tag and push tag
run: |
cd repo
Expand All @@ -43,14 +43,14 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Setup Mkdocs
run: |
pip install mkdocs mkdocs-macros-plugin mkdocs-drawio-exporter mkdocs-bibtex mike mkdocs-glightbox pillow cairosvg
pip install git+https://${{ secrets.MKDOCS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
apt-get update && apt-get install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev
apt-get update && apt-get install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev
- name: Build Doxygen
run: |
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
git push origin gh-pages
export MKDOCSOFFLINE=true
- uses: actions/cache@v2
- uses: actions/cache@v4
with:
key: ${{ github.ref }}
path: .cache
Expand All @@ -104,7 +104,7 @@ jobs:
install -m 0755 -d /etc/apt/keyrings
curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
chmod a+r /etc/apt/keyrings/docker.gpg
# Add the repository to Apt sources:
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
Expand All @@ -117,22 +117,22 @@ jobs:
run: |
docker pull ikarusproject/ikarus-dev:latest
docker tag ikarusproject/ikarus-dev:latest ikarusproject/ikarus-dev:v$NEWVERSION
docker pull ikarusproject/ikarus-dev-gcc:latest
docker tag ikarusproject/ikarus-dev-gcc:latest ikarusproject/ikarus-dev-gcc:v$NEWVERSION
docker pull ikarusproject/ikarus-dev-clang:latest
docker tag ikarusproject/ikarus-dev-clang:latest ikarusproject/ikarus-dev-clang:v$NEWVERSION
docker pull ikarusproject/ikarus:latest
docker tag ikarusproject/ikarus:latest ikarusproject/ikarus:v$NEWVERSION
docker pull ikarusproject/ikarus-gcc:latest
docker tag ikarusproject/ikarus-gcc:latest ikarusproject/ikarus-gcc:v$NEWVERSION
docker pull ikarusproject/ikarus-clang:latest
docker tag ikarusproject/ikarus-clang:latest ikarusproject/ikarus-clang:v$NEWVERSION
#docker save ikarusproject/ikarus-dev:v$NEWVERSION > ikarus-dev-docker-v$NEWVERSION.tar
docker save ikarusproject/ikarus:v$NEWVERSION > ikarus-docker-v$NEWVERSION.tar
#gzip -c9 ikarus-dev-docker-v$NEWVERSION.tar > ikarus-dev-docker-v$NEWVERSION.tar.gz
Expand All @@ -151,7 +151,7 @@ jobs:
zip -9r ikarus-examples-v$NEWVERSION.zip ./ikarus-examples-v$NEWVERSION
- name: Push and finalize
run: |
run: |
cd ikarus-project.github.io
git push origin gh-pages
cd ../ikarus-examples-v$NEWVERSION
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/debian-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ name: CodeCoverage
on:
push:
paths-ignore:
- 'docs/**'
- '.github/workflows/ghpages.yml'
- '.github/workflows/createDockerContainer.yml'
- '**.md'
- "docs/**"
- ".github/workflows/ghpages.yml"
- ".github/workflows/createDockerContainer.yml"
- "**.md"

pull_request:
types: [opened]
branches:
- main
paths-ignore:
- 'docs/**'
- '.github/workflows/ghpages.yml'
- '.github/workflows/createDockerContainer.yml'
- '**.md'
- "docs/**"
- ".github/workflows/ghpages.yml"
- ".github/workflows/createDockerContainer.yml"
- "**.md"
workflow_dispatch:

env:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
llvm-cov-16 gcov $(find ./cmake-build-debug-coverage -not -path "*dune-env/*" -type f -name "*.gcno" | sed 's/gcno//g')
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: tests
Expand Down
88 changes: 44 additions & 44 deletions .github/workflows/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ name: Debian
on:
push:
paths-ignore:
- 'docs/**'
- '.github/workflows/ghpages.yml'
- '.github/workflows/createDockerContainer.yml'
- '**.md'
- "docs/**"
- ".github/workflows/ghpages.yml"
- ".github/workflows/createDockerContainer.yml"
- "**.md"

pull_request:
types: [opened]
branches:
- main
paths-ignore:
- 'docs/**'
- '.github/workflows/ghpages.yml'
- '.github/workflows/createDockerContainer.yml'
- '**.md'
- "docs/**"
- ".github/workflows/ghpages.yml"
- ".github/workflows/createDockerContainer.yml"
- "**.md"
workflow_dispatch:

jobs:
Expand All @@ -33,49 +33,49 @@ jobs:
matrix:
config:
- {
name: "Clang-16-Debug",
config: Debug,
compilerC: clang-16,
compilerCxx: clang++-16,
lib: "-stdlib=libc++",
testRegex: "cpp_quick"
}
name: "Clang-16-Debug",
config: Debug,
compilerC: clang-16,
compilerCxx: clang++-16,
lib: "-stdlib=libc++",
testRegex: "cpp_quick",
}
- {
name: "Clang-16-Release",
config: Release,
compilerC: clang-16,
compilerCxx: clang++-16,
lib: "-stdlib=libc++",
testRegex: "cpp"
}
name: "Clang-16-Release",
config: Release,
compilerC: clang-16,
compilerCxx: clang++-16,
lib: "-stdlib=libc++",
testRegex: "cpp",
}
- {
name: "Gcc-12-Debug",
config: Debug,
compilerC: gcc-12,
compilerCxx: g++-12,
lib: "",
testRegex: "cpp_quick"
}
name: "Gcc-12-Debug",
config: Debug,
compilerC: gcc-12,
compilerCxx: g++-12,
lib: "",
testRegex: "cpp_quick",
}
- {
name: "Gcc-12-Release",
config: Release,
compilerC: gcc-12,
compilerCxx: g++-12,
lib: "",
testRegex: "cpp"
}
name: "Gcc-12-Release",
config: Release,
compilerC: gcc-12,
compilerCxx: g++-12,
lib: "",
testRegex: "cpp",
}
- {
name: "Gcc-12-Python",
config: Release,
compilerC: gcc-12,
compilerCxx: g++-12,
lib: "",
testRegex: "python"
}
name: "Gcc-12-Python",
config: Release,
compilerC: gcc-12,
compilerCxx: g++-12,
lib: "",
testRegex: "python",
}
steps:
- uses: actions/checkout@v4
with:
path: 'repo'
path: "repo"
- name: Build
working-directory: ./repo
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docsDryRun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
path: 'repo'
- uses: actions/setup-python@v4
path: "repo"
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Setup Mkdocs
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ghpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
path: 'repo'
- uses: actions/setup-python@v4
path: "repo"
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Setup Mkdocs
Expand Down Expand Up @@ -68,4 +68,5 @@ jobs:
mike deploy dev --config-file mkdocs.insiders.yml
git remote set-url origin https://${{ secrets.ORGANIZATION_TOKEN }}@github.com/ikarus-project/ikarus-project.github.io.git
git push origin gh-pages
# git commit --amend -m "Deploy dev at ${{ github.event.head_commit.message }} ikarus-project/ikarus@${{ github.event.head_commit.id }}"
2 changes: 1 addition & 1 deletion .github/workflows/releasePythonPackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
options: --memory-swap="20g" --memory="20g" --cpus="2" --user root

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install twine and scikit-build
run: |
/dune/dune-common/build-cmake/run-in-dune-env pip install twine scikit-build
Expand Down
Loading

0 comments on commit bc95a34

Please sign in to comment.