Skip to content

Commit

Permalink
Update Docker and WebService Setup (#92)
Browse files Browse the repository at this point in the history
Co-authored-by: Moritz Sternemann <[email protected]>
Co-authored-by: Philipp Zagar <[email protected]>
  • Loading branch information
3 people authored Apr 13, 2022
1 parent 4ff6487 commit 239d71e
Show file tree
Hide file tree
Showing 50 changed files with 24,801 additions and 676 deletions.
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ KIBANA_SYSTEM_PASSWORD=FA2021

LOGSTASH_SYSTEM_USER=logstash_system
LOGSTASH_SYSTEM_PASSWORD=FA2021

REACT_APP_SCIENCE_LAB_MAP_ACCESS_TOKEN=<ACCESS TOKEN>
18 changes: 11 additions & 7 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
# *Name of the PR*

## :recycle: Current situation
## :recycle: Current situation & Problem
*Describe the current situation (if possible with and exemplary (or real) code snippet and/or where this is used)*
*Please link any open issue that is addressed with this PR*

## :bulb: Proposed solution
*Describe the solution (if possible with and exemplary (or real) code snippet)*
*Describe the solution and how this affects the project and internal structure*

### Problem that is solved
*Provide a description and link issues that are solved*

### Implications
*Describe the implications, e.g. refactoring*
## :gear: Release Notes
*Add a short summary of the feature as well as possible migration guides if this is a breaking change so this section can be added to the release notes.*
*Include code snippets that provide examples of the feature implemented if it appends or changes the public interface.*

## :heavy_plus_sign: Additional Information
*Provide some additional information if possible*
Expand All @@ -23,3 +22,8 @@

### Reviewer Nudging
*Where should the reviewer start, where is a good entry point?*

### Code of Conduct & Contributing Guidelines

By submitting creating this pull request, you agree to follow our [Code of Conduct](https://github.com/Apodini/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/Apodini/.github/blob/main/CONTRIBUTING.md):
- [ ] I agree to follow the [Code of Conduct](https://github.com/Apodini/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/Apodini/.github/blob/main/CONTRIBUTING.md).
20 changes: 0 additions & 20 deletions .github/release-drafter.yml

This file was deleted.

15 changes: 15 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
changelog:
exclude:
authors:
- ApodiniBot
categories:
- title: Semantic Version Major
labels:
- needs version bump
- title: Semantic Version Minor
labels:
- bug
- enhancement
- title: Other Changes
labels:
- "*"
63 changes: 18 additions & 45 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Test (deprecated)
name: Build and Test

on:
pull_request:
Expand All @@ -7,47 +7,20 @@ on:
workflow_dispatch:

jobs:
# Doesn't work since MacOS12 is required, not available via GitHub Actions yet
# macoswebservices:
# name: macOS WebService
# runs-on: macos-11
# defaults:
# run:
# working-directory: ./WebService
# steps:
# - uses: actions/checkout@v2
# - uses: maxim-lobanov/[email protected]
# with:
# xcode-version: latest
# - name: Check Xcode version
# run: xcodebuild -version
# - name: Check Swift version
# run: swift --version
# - name: Build and test
# run: swift test
linuxwebservices:
name: Linux WebService ${{ matrix.linux }}
runs-on: ubuntu-latest
container:
image: swiftlang/swift:nightly-5.5-${{ matrix.linux }}
strategy:
matrix:
linux: [bionic, focal, amazonlinux2, centos8]
defaults:
run:
working-directory: ./WebService
steps:
- uses: actions/checkout@v2
- name: Install libsqlite3
if: ${{ !(startsWith( matrix.linux, 'centos' ) || startsWith( matrix.linux, 'amazonlinux' )) }}
run: apt-get update && apt-get install -y --no-install-recommends libsqlite3-dev
- name: Install libsqlite3
if: startsWith( matrix.linux, 'amazonlinux' )
run: yum update -y && yum install -y sqlite-devel
- name: Install libsqlite3
if: startsWith( matrix.linux, 'centos' )
run: yum update -y --nobest && yum install -y sqlite-devel
- name: Check Swift version
run: swift --version
- name: Build and test
run: swift test -Xswiftc -Xfrontend -Xswiftc -sil-verify-none
docker-compose-test:
name: Docker Compose Test
uses: Apodini/.github/.github/workflows/docker-compose-test.yml@v1
with:
docker-compose-file: docker-compose.yml
testscript: test.sh
swiftlint:
name: SwiftLint
uses: Apodini/.github/.github/workflows/swiftlint.yml@v1
build_and_test:
name: Build and Test
uses: Apodini/.github/.github/workflows/build-and-test.yml@v1
with:
path: ./WebService
packagename: ScienceLabWebservice
aptgetdependencies: libsqlite3-dev
yumdependencies: sqlite-devel
20 changes: 0 additions & 20 deletions .github/workflows/docker-compose.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/release-drafter.yml

This file was deleted.

15 changes: 0 additions & 15 deletions .github/workflows/release.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/swiftlint.yml

This file was deleted.

9 changes: 9 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- Paul Schmiedmayer
- Aaron Tacke
- Mareike Weber
- Viola Li
- Philipp, Zagar
- Felix Rinderer
- Leander Pfeiffer
- Christoph Gruber
- Moritz Sternemann
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021 project authors (see CONTRIBUTORS.md)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 0 additions & 4 deletions Observability/grafana/provisioning/dashboards/.gitignore

This file was deleted.

Loading

0 comments on commit 239d71e

Please sign in to comment.