From 3f746cc0beb5756e706e289ab2b92b43de928f74 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 13 May 2019 22:03:51 +0200 Subject: Remove travis config, add gitlab CI --- .gitlab-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .gitlab-ci.yml (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..e55b711 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,43 @@ +image: swift:5.0.1 + +stages: + - lint + - build + - document + - deploy + +cache: + key: ${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} + paths: + - .build/ + +before_script: + - gem install jazzy + - "./Scripts/install_sourcekitten.sh" + - "./Scripts/install_swiftlint.sh" + +lint: + stage: lint + script: + - make lint + +build: + stage: build + script: + - make build + +document: + stage: document + script: + - make document + artifacts: + paths: + - docs + +pages: + stage: deploy + script: + - mv docs public + artifacts: + paths: + - public -- cgit From 3f7a07b8b9c62994fce87e37fd2f67b683cb6c58 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 13 May 2019 22:15:14 +0200 Subject: Install Jazzy dependencies --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e55b711..2fa5994 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ cache: - .build/ before_script: + - apt install -y ruby ruby-dev libsqlite3-dev - gem install jazzy - "./Scripts/install_sourcekitten.sh" - "./Scripts/install_swiftlint.sh" -- cgit From 19e7bffcd3401026517e1f02d55f6050d3baf80d Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 13 May 2019 22:21:46 +0200 Subject: Add wget to apt packages --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fa5994..4d984cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ cache: - .build/ before_script: - - apt install -y ruby ruby-dev libsqlite3-dev + - apt install -y ruby ruby-dev libsqlite3-dev wget - gem install jazzy - "./Scripts/install_sourcekitten.sh" - "./Scripts/install_swiftlint.sh" -- cgit From 6a628388c496987819ef26bda1a99595bce2b1d5 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 13 May 2019 23:22:58 +0200 Subject: Makes test environment docker-based Provides Dockerfile to build test environment that should be used by CI --- .gitlab-ci.yml | 8 +------- Dockerfile | 26 ++++++++++++++++++++++++++ Makefile | 9 ++++++++- Scripts/install_sourcekitten.sh | 10 ---------- Scripts/install_swiftlint.sh | 11 ----------- 5 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 Dockerfile delete mode 100755 Scripts/install_sourcekitten.sh delete mode 100755 Scripts/install_swiftlint.sh (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d984cb..ebe400d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: swift:5.0.1 +image: lyriclitest/swift:5.0.1 stages: - lint @@ -11,12 +11,6 @@ cache: paths: - .build/ -before_script: - - apt install -y ruby ruby-dev libsqlite3-dev wget - - gem install jazzy - - "./Scripts/install_sourcekitten.sh" - - "./Scripts/install_swiftlint.sh" - lint: stage: lint script: diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..db35f5c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,26 @@ +ARG swift_version=latest +FROM swift:${swift_version} + +RUN apt-get update && apt-get install -y \ + libsqlite3-dev \ + ruby \ + ruby-dev \ + wget \ + && rm -rf /var/lib/apt/lists/* + +RUN gem install --no-ri --no-rdoc jazzy + +# SourceKitten + +RUN git clone https://github.com/jpsim/SourceKitten.git /tmp/SourceKitten \ + && cd /tmp/SourceKitten \ + && make install \ + && rm -rf /tmp/SourceKitten + +# Swiftlint + +RUN git clone https://github.com/realm/SwiftLint.git /tmp/SwiftLint \ + && cd /tmp/SwiftLint \ + && git submodule update --init --recursive \ + && make install \ + && rm -rf /tmp/SwiftLint diff --git a/Makefile b/Makefile index 3066e11..d993480 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ target_binary_name = lrc install_path = /usr/local/bin source_binary_path = $(build_path)/$(configuration)/$(source_binary_name) install_binary_path = $(install_path)/$(target_binary_name) +swift_version = 5.0.1 # Default to release configuration on install install: configuration = release @@ -40,4 +41,10 @@ document: build clean: swift package clean -.PHONY: build install test clean lint +docker-build: + docker build --force-rm --build-arg swift_version=$(swift_version) -t lyriclitest/swift:$(swift_version) . + +docker-push: docker-build + docker push lyriclitest/swift:$(swift_version) + +.PHONY: build install test clean lint docker-build docker-push diff --git a/Scripts/install_sourcekitten.sh b/Scripts/install_sourcekitten.sh deleted file mode 100755 index f94fb53..0000000 --- a/Scripts/install_sourcekitten.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Installs SourceKitten from source (Intended to be used with -# swift docker image) - -set -e - -git clone https://github.com/jpsim/SourceKitten.git /tmp/SourceKitten && -cd /tmp/SourceKitten && -make install diff --git a/Scripts/install_swiftlint.sh b/Scripts/install_swiftlint.sh deleted file mode 100755 index 4b8299d..0000000 --- a/Scripts/install_swiftlint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Installs SwiftLint from source (Intended to be used with -# swift docker image) - -set -e - -git clone https://github.com/realm/SwiftLint.git /tmp/SwiftLint && -cd /tmp/SwiftLint && -git submodule update --init --recursive && -make install -- cgit From a12f29158ced867c200ce8ea596fa46b17c8c18a Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 9 Mar 2020 21:43:39 -0500 Subject: Removing build because no Scripting bridge :() --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebe400d..225ceac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ image: lyriclitest/swift:5.0.1 stages: - lint - - build - document - deploy @@ -16,11 +15,6 @@ lint: script: - make lint -build: - stage: build - script: - - make build - document: stage: document script: -- cgit From 2a7cc52436ab4a7b6530881513679ac7ede997a8 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 9 Mar 2020 21:52:28 -0500 Subject: Removing gitlab CI config I can't build / document currently --- .gitlab-ci.yml | 2 -- Makefile | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 225ceac..56fa677 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,6 @@ image: lyriclitest/swift:5.0.1 stages: - lint - - document - - deploy cache: key: ${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA} diff --git a/Makefile b/Makefile index d244996..8428b44 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,7 @@ install: configuration = release default: build -prebuild: - mkdir -p $(build_path) - -build: prebuild +build: swift build --build-path $(build_path) --configuration $(configuration) install: build @@ -29,7 +26,7 @@ test: build lint: cd Sources && swiftlint -document: prebuild +document: build sourcekitten doc --spm-module $(source_binary_name) > $(build_path)/$(source_binary_name).json jazzy \ -s $(build_path)/$(source_binary_name).json \ -- cgit From 9931580d9185e9123b6d45a45f20dbf929bb25b7 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 9 Mar 2020 21:55:36 -0500 Subject: Remove unused configs --- .gitlab-ci.yml | 16 ---------------- 1 file changed, 16 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56fa677..04ec6ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,19 +12,3 @@ lint: stage: lint script: - make lint - -document: - stage: document - script: - - make document - artifacts: - paths: - - docs - -pages: - stage: deploy - script: - - mv docs public - artifacts: - paths: - - public -- cgit