From aaf058f0d6fa4868e4360780c50aa6e620e0f3db Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Sun, 14 Apr 2019 16:12:02 +0200 Subject: Update CHANGELOG & Version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6bbe735..8c79c08 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ document: build --author Lyricli \ --author_url https://github.com/lyricli-app \ --github_url https://github.com/lyricli-app/lyricli \ - --module-version 0.3.0 \ + --module-version 0.4.0 \ --module Lyricli \ clean: -- cgit From ffca0db7f130be1138844aa22be71493bcf57d26 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Sun, 14 Apr 2019 16:48:05 +0200 Subject: Use gitlab links in jazzy docs --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8c79c08..5cd7660 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,8 @@ document: build --readme README.md \ --clean \ --author Lyricli \ - --author_url https://github.com/lyricli-app \ - --github_url https://github.com/lyricli-app/lyricli \ + --author_url https://gitlab.com/lyricli \ + --github_url https://gitlab.com/lyricli/lyricli \ --module-version 0.4.0 \ --module Lyricli \ -- cgit From c32d8723eb863a95d821f4dc18281e17965d4025 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 13 May 2019 21:49:00 +0200 Subject: Update clean command --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5cd7660..3066e11 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,6 @@ document: build --module Lyricli \ clean: - swift build --clean + swift package clean .PHONY: build install test clean lint -- 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 'Makefile') 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 101a6eccd794add1a4b1fcb1c9b0d6ece24d2939 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 9 Mar 2020 21:39:27 -0500 Subject: Update version in makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d993480..8428b44 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ document: build --author Lyricli \ --author_url https://gitlab.com/lyricli \ --github_url https://gitlab.com/lyricli/lyricli \ - --module-version 0.4.0 \ + --module-version 1.0.0 \ --module Lyricli \ clean: -- cgit From 97f47198a0dd96c571ec1086e7f8c68963d263d0 Mon Sep 17 00:00:00 2001 From: Ben Beltran Date: Mon, 9 Mar 2020 21:48:25 -0500 Subject: Create build folder before documenting --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8428b44..d244996 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,10 @@ install: configuration = release default: build -build: +prebuild: + mkdir -p $(build_path) + +build: prebuild swift build --build-path $(build_path) --configuration $(configuration) install: build @@ -26,7 +29,7 @@ test: build lint: cd Sources && swiftlint -document: build +document: prebuild sourcekitten doc --spm-module $(source_binary_name) > $(build_path)/$(source_binary_name).json jazzy \ -s $(build_path)/$(source_binary_name).json \ -- 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 'Makefile') 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