Skip to content

Commit

Permalink
Update GitHub Action (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
PSchmiedmayer authored Dec 4, 2021
1 parent e14b1f6 commit a77a553
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 83 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ jobs:
- uses: actions/checkout@v2
- uses: maxim-lobanov/[email protected]
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
Expand All @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@v2
- uses: maxim-lobanov/[email protected]
with:
xcode-version: latest
xcode-version: latest-stable
- uses: actions/cache@v2
with:
path: .build
Expand All @@ -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:
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
22 changes: 0 additions & 22 deletions .github/workflows/release-drafter.yml

This file was deleted.

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

This file was deleted.

24 changes: 7 additions & 17 deletions Client/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1300;
LastSwiftUpdateCheck = 1320;
LastUpgradeCheck = 1300;
TargetAttributes = {
6501B334268F2E23001EC708 = {
Expand Down Expand Up @@ -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)";
Expand All @@ -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)";
Expand Down Expand Up @@ -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 = "";
Expand All @@ -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";
Expand All @@ -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 = "";
Expand All @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions Database/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Gateway/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Processing/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit a77a553

Please sign in to comment.