Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into feature/TF-733-J2.4-make-enums-…
Browse files Browse the repository at this point in the history
…obligatory-for-oop-lab

# Conflicts:
#	content/en/labs/java/java-oop/04_Streaming_Dienst.md
  • Loading branch information
Friedli Jonas (IT-PTR-CEN1-BDE21) committed Jan 6, 2025
2 parents 529e3f5 + 0d4cc1f commit aa37e2e
Show file tree
Hide file tree
Showing 2,652 changed files with 11,736 additions and 256,195 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
on:
workflow_call:
inputs:
upload-artifact:
type: boolean
default: false
artifact-retention-days:
type: number
default: 1
artifact-name:
type: string
default: build
deploy:
type: boolean
default: false
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive # Fetch the Docsy theme
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: '0.135.0'
extended: true
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '22.x'
- run: npm ci
- run: npm -g install postcss-cli
- run: hugo --minify --environment production
- name: Upload build artifact
uses: actions/upload-artifact@v4
if: ${{ inputs.upload-artifact }}
with:
name: ${{ inputs.artifact-name }}
path: ./public
retention-days: ${{ inputs.artifact-retention-days }}
- name: Deploy
uses: peaceiris/actions-gh-pages@v4
if: ${{ inputs.deploy }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
- name: Check
uses: jtalk/url-health-check-action@v4
if: ${{ inputs.deploy }}
with:
url: https://labs.it-ninjas.ch/
follow-redirect: true
max-attempts: 3
retry-delay: 10s
12 changes: 12 additions & 0 deletions .github/workflows/deploy-to-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: GitHub Pages

on:
push:
branches:
- master

jobs:
deploy:
uses: ./.github/workflows/build-deploy.yml
with:
deploy: true
43 changes: 0 additions & 43 deletions .github/workflows/main.yml

This file was deleted.

35 changes: 35 additions & 0 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Quality
on: [ push ]
jobs:
build:
uses: ./.github/workflows/build-deploy.yml
with:
upload-artifact: true
artifact-name: quality-check-build
check-links:
runs-on: ubuntu-latest
needs: build
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Download build
uses: actions/download-artifact@v4
with:
name: quality-check-build
path: ./public
- run: ls -ahl
- name: Run htmltest
uses: wjdp/htmltest-action@master
with:
config: .htmltest.yml
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v4
- name: Install
run: npm install
- name: Lint
run: npm run lint
38 changes: 0 additions & 38 deletions .github/workflows/test.yml

This file was deleted.

132 changes: 131 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,133 @@
/.idea/
/training-sbb-puzzle.iml
/node_modules/
/node_modules/

# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,intellij+all,hugo
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,intellij+all,hugo

### Hugo ###
# Generated files by hugo
/public/
/resources/_gen/
/assets/jsconfig.json
hugo_stats.json

# Executable may be added to repository
hugo.exe
hugo.darwin
hugo.linux

# Temporary lock file while building
/.hugo_build.lock

### Intellij+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij+all Patch ###
# Ignore everything but code style settings and run configurations
# that are supposed to be shared within teams.

.idea/*

!.idea/codeStyles
!.idea/runConfigurations

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets

# Local History for Visual Studio Code
.history/

# Built Visual Studio Code Extensions
*.vsix

### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide

# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,intellij+all,hugo

# htmltest
/tmp
8 changes: 8 additions & 0 deletions .htmltest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
DirectoryPath: ./public
IgnoreAltMissing: true
IgnoreAltEmpty: true
IgnoreURLs:
- /livereload.js
- ^...$
IgnoreDirectoryMissingTrailingSlash: true
CheckExternal: false
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npm run format
8 changes: 8 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Ignore all HTML files:
**/*.html

# Ignore all VCS stuff
**/.git
**/.svn
**/.hg
**/node_modules
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"embeddedLanguageFormatting": "auto",
"proseWrap": "preserve"
}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM klakegg/hugo:0.81.0-ext-ubuntu AS builder
FROM hugomods/hugo:0.135.0 AS builder

ARG HUGO_ENV=default

Expand Down
Loading

0 comments on commit aa37e2e

Please sign in to comment.