From a77a55340444ce0ed2a241ab412c9928fda77173 Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Sat, 4 Dec 2021 11:49:33 +0100 Subject: [PATCH] Update GitHub Action (#6) --- .github/workflows/build-and-test.yml | 10 +++++----- .github/workflows/docker.yml | 11 +---------- .github/workflows/release-drafter.yml | 22 ---------------------- .github/workflows/release.yml | 23 ----------------------- Client/Example.xcodeproj/project.pbxproj | 24 +++++++----------------- Database/Dockerfile | 4 ++-- Gateway/Dockerfile | 4 ++-- Processing/Dockerfile | 4 ++-- 8 files changed, 19 insertions(+), 83 deletions(-) delete mode 100644 .github/workflows/release-drafter.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3b9807f..b21ac19 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -25,13 +25,13 @@ jobs: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1.1 with: - xcode-version: latest + xcode-version: latest-stable - name: Check Xcode version run: xcodebuild -version - name: Check Swift version run: swift --version - name: Build and test - run: xcodebuild test -scheme Example -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 12' + run: xcodebuild test -scheme Example -destination 'platform=iOS Simulator,name=iPhone 13' macoswebservices: name: macOS ${{ matrix.webservice }} ${{ matrix.configuration }} runs-on: macos-11 @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1.2.3 with: - xcode-version: latest + xcode-version: latest-stable - uses: actions/cache@v2 with: path: .build @@ -66,12 +66,12 @@ jobs: name: Linux ${{ matrix.webservice }} ${{ matrix.linux }} ${{ matrix.configuration }} runs-on: ubuntu-latest container: - image: swiftlang/swift:nightly-5.5-${{ matrix.linux }} + image: swift:5.5-${{ matrix.linux }} strategy: fail-fast: false matrix: webservice: [Gateway, Database, Processing] - linux: [bionic, focal, amazonlinux2, centos8] + linux: [focal] configuration: [debug, release, release_testing] defaults: run: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a5264a1..6560032 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -32,24 +32,15 @@ jobs: uses: WyriHaximus/github-action-get-previous-tag@v1 with: fallback: latest - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up docker buildx - uses: docker/setup-buildx-action@v1 - with: - install: true - name: Log in to the container registry uses: docker/login-action@v1 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push docker image - id: buildandpush + - name: Build and push docker imag uses: docker/build-push-action@v2 with: context: ./${{ matrix.webservice }} push: true tags: ghcr.io/apodini/collectoranalystpresenterexample/${{ steps.webservice.outputs.lowercase }}:latest,ghcr.io/apodini/collectoranalystpresenterexample/${{ steps.webservice.outputs.lowercase }}:${{ steps.latesttag.outputs.tag }} - - name: Image digest - run: echo ${{ steps.buildandpush.outputs.digest }} diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index ec95e87..0000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,22 +0,0 @@ -# -# This source file is part of the Collector-Analyst-Presenter Example open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: Release Drafter - -on: - push: - branches: - - develop - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - - uses: release-drafter/release-drafter@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index bd9eef0..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,23 +0,0 @@ -# -# This source file is part of the Collector-Analyst-Presenter Example open source project -# -# SPDX-FileCopyrightText: 2021 Paul Schmiedmayer and the project authors (see CONTRIBUTORS.md) -# -# SPDX-License-Identifier: MIT -# - -name: Create Release - -on: - push: - tags: - - '*.*.*' - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Create GitHub Release - uses: softprops/action-gh-release@v0.1.5 - env: - GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} diff --git a/Client/Example.xcodeproj/project.pbxproj b/Client/Example.xcodeproj/project.pbxproj index af6254c..5fe97bd 100644 --- a/Client/Example.xcodeproj/project.pbxproj +++ b/Client/Example.xcodeproj/project.pbxproj @@ -153,7 +153,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = 1; - LastSwiftUpdateCheck = 1300; + LastSwiftUpdateCheck = 1320; LastUpgradeCheck = 1300; TargetAttributes = { 6501B334268F2E23001EC708 = { @@ -243,11 +243,6 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = ase.in.tum.de.ExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -264,11 +259,6 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = ase.in.tum.de.ExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -398,10 +388,9 @@ 657977ED268DD1C70099F653 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_IDENTITY = "Don't Code Sign"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; @@ -420,6 +409,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = ase.in.tum.de.example; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -429,10 +419,9 @@ 657977EE268DD1C70099F653 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_IDENTITY = "Don't Code Sign"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; @@ -451,6 +440,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = ase.in.tum.de.example; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/Database/Dockerfile b/Database/Dockerfile index e43ff99..6219f1b 100644 --- a/Database/Dockerfile +++ b/Database/Dockerfile @@ -9,7 +9,7 @@ # ================================ # Build image # ================================ -FROM swiftlang/swift:nightly-5.5-focal as build +FROM swift:5.5-focal as build # Install OS updates and, if needed, sqlite3 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \ @@ -44,7 +44,7 @@ RUN [ -d "$(swift build --package-path /build -c release --show-bin-path)/Databa # ================================ # Run image # ================================ -FROM swiftlang/swift:nightly-5.5-focal-slim as run +FROM swift:5.5-focal-slim as run # Make sure all system packages are up to date. RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \ diff --git a/Gateway/Dockerfile b/Gateway/Dockerfile index bac00b9..5de8b42 100644 --- a/Gateway/Dockerfile +++ b/Gateway/Dockerfile @@ -9,7 +9,7 @@ # ================================ # Build image # ================================ -FROM swiftlang/swift:nightly-5.5-focal as build +FROM swift:5.5-focal as build # Install OS updates and, if needed, sqlite3 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \ @@ -44,7 +44,7 @@ RUN [ -d "$(swift build --package-path /build -c release --show-bin-path)/Gatewa # ================================ # Run image # ================================ -FROM swiftlang/swift:nightly-5.5-focal-slim as run +FROM swift:5.5-focal-slim as run # Make sure all system packages are up to date. RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \ diff --git a/Processing/Dockerfile b/Processing/Dockerfile index 1c13c2b..4e7c423 100644 --- a/Processing/Dockerfile +++ b/Processing/Dockerfile @@ -9,7 +9,7 @@ # ================================ # Build image # =============================== -FROM swiftlang/swift:nightly-5.5-focal as build +FROM swift:5.5-focal as build # Install OS updates and, if needed, sqlite3 RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \ @@ -43,7 +43,7 @@ RUN [ -d "$(swift build --package-path /build -c release --show-bin-path)/Proces # ================================ # Run image # ================================ -FROM swiftlang/swift:nightly-5.5-focal-slim as run +FROM swift:5.5-focal-slim as run # Make sure all system packages are up to date. RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \