From 251856cf3fe84bb5ce0fdde65be28ebecdce09a1 Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Wed, 7 Dec 2016 01:35:12 +0100 Subject: [PATCH 1/9] Build all assets with drone --- .drone.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.drone.yml b/.drone.yml index 9c5f415..a3d6ff8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,6 +2,13 @@ workspace: path: src pipeline: + build: + image: node + commands: + - npm install -q + - npm install -q -g gulp-cli + - gulp + downstream: image: plugins/downstream server: https://drone.gitea.io From 84c250ea12a919084f288a11a3219b6615d9f112 Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Wed, 7 Dec 2016 01:54:22 +0100 Subject: [PATCH 2/9] Create Makefile to create release and distribute with minio --- .drone.yml | 16 +++++++++++++--- .drone.yml.sig | 2 +- .gitignore | 1 + Makefile | 31 +++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 Makefile diff --git a/.drone.yml b/.drone.yml index a3d6ff8..c133cd6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,9 +5,19 @@ pipeline: build: image: node commands: - - npm install -q - - npm install -q -g gulp-cli - - gulp + - make install + - make build + - make release + + release: + image: plugins/s3 + path_style: true + strip_prefix: dist/ + source: dist/* + target: /theme/master + when: + event: [ push ] + branch: [ master ] downstream: image: plugins/downstream diff --git a/.drone.yml.sig b/.drone.yml.sig index 279006e..1113d80 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgZG93bnN0cmVhbToKICAgIGltYWdlOiBwbHVnaW5zL2Rvd25zdHJlYW0KICAgIHNlcnZlcjogaHR0cHM6Ly9kcm9uZS5naXRlYS5pbwogICAgcmVwb3NpdG9yaWVzOgogICAgICAtIGdvLWdpdGVhL3dlYnNpdGUKICAgICAgLSBnby1naXRlYS9ibG9nCiAgICAgIC0gZ28tZ2l0ZWEvZG9jcwogICAgICAtIGdvLWdpdGVhL3JlZGlyZWN0cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1c2gKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCg.lHRIDpUb3xcDLTmMupUq1uSU7XR47kKiAOsOlYw57BM \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogbm9kZQogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBpbnN0YWxsCiAgICAgIC0gbWFrZSBidWlsZAogICAgICAtIG1ha2UgcmVsZWFzZQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC8KICAgIHNvdXJjZTogZGlzdC8qCiAgICB0YXJnZXQ6IC90aGVtZS9tYXN0ZXIKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KCiAgZG93bnN0cmVhbToKICAgIGltYWdlOiBwbHVnaW5zL2Rvd25zdHJlYW0KICAgIHNlcnZlcjogaHR0cHM6Ly9kcm9uZS5naXRlYS5pbwogICAgcmVwb3NpdG9yaWVzOgogICAgICAtIGdvLWdpdGVhL3dlYnNpdGUKICAgICAgLSBnby1naXRlYS9ibG9nCiAgICAgIC0gZ28tZ2l0ZWEvZG9jcwogICAgICAtIGdvLWdpdGVhL3JlZGlyZWN0cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1c2gKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCg.JvhvP3thB6HoDuHhdT7XP9Cqlk7KsYU7L4oyjXZv8O0 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 066ebdf..6f5c55c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +/dist/ /node_modules/ /static/styles/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2b505b9 --- /dev/null +++ b/Makefile @@ -0,0 +1,31 @@ +STYLES := static/styles +DIST := dist + +.PHONY: all +all: build + +.PHONY: clean +clean: + rm -rf $(STYLES) $(DIST) + +.PHONY: install +install: + npm install -q + npm install -q -g gulp-cli + +.PHONY: build +build: + gulp + +.PHONY: release +release: + mkdir -p dist/ + cp -r archetypes/ dist/ + cp -r i18n/ dist/ + cp -r layouts/ dist/ + cp -r static/ dist/ + cp -r DCO dist/ + cp -r LICENSE dist/ + cp -r MAINTAINERS dist/ + cp -r README.md dist/ + cp -r theme.toml dist/ From 8f83855fd8476d57b45b220c8e542d8f5a9e0ff3 Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Wed, 7 Dec 2016 01:35:12 +0100 Subject: [PATCH 3/9] Build all assets with drone --- .drone.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.drone.yml b/.drone.yml index 9c5f415..a3d6ff8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,6 +2,13 @@ workspace: path: src pipeline: + build: + image: node + commands: + - npm install -q + - npm install -q -g gulp-cli + - gulp + downstream: image: plugins/downstream server: https://drone.gitea.io From b87a9d22f9d9021b004fdd0b43e43c084775342f Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Wed, 7 Dec 2016 01:54:22 +0100 Subject: [PATCH 4/9] Create Makefile to create release and distribute with minio --- .drone.yml | 16 +++++++++++++--- .drone.yml.sig | 2 +- .gitignore | 1 + Makefile | 31 +++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 Makefile diff --git a/.drone.yml b/.drone.yml index a3d6ff8..c133cd6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,9 +5,19 @@ pipeline: build: image: node commands: - - npm install -q - - npm install -q -g gulp-cli - - gulp + - make install + - make build + - make release + + release: + image: plugins/s3 + path_style: true + strip_prefix: dist/ + source: dist/* + target: /theme/master + when: + event: [ push ] + branch: [ master ] downstream: image: plugins/downstream diff --git a/.drone.yml.sig b/.drone.yml.sig index 279006e..1113d80 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgZG93bnN0cmVhbToKICAgIGltYWdlOiBwbHVnaW5zL2Rvd25zdHJlYW0KICAgIHNlcnZlcjogaHR0cHM6Ly9kcm9uZS5naXRlYS5pbwogICAgcmVwb3NpdG9yaWVzOgogICAgICAtIGdvLWdpdGVhL3dlYnNpdGUKICAgICAgLSBnby1naXRlYS9ibG9nCiAgICAgIC0gZ28tZ2l0ZWEvZG9jcwogICAgICAtIGdvLWdpdGVhL3JlZGlyZWN0cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1c2gKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCg.lHRIDpUb3xcDLTmMupUq1uSU7XR47kKiAOsOlYw57BM \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogbm9kZQogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBpbnN0YWxsCiAgICAgIC0gbWFrZSBidWlsZAogICAgICAtIG1ha2UgcmVsZWFzZQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC8KICAgIHNvdXJjZTogZGlzdC8qCiAgICB0YXJnZXQ6IC90aGVtZS9tYXN0ZXIKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KCiAgZG93bnN0cmVhbToKICAgIGltYWdlOiBwbHVnaW5zL2Rvd25zdHJlYW0KICAgIHNlcnZlcjogaHR0cHM6Ly9kcm9uZS5naXRlYS5pbwogICAgcmVwb3NpdG9yaWVzOgogICAgICAtIGdvLWdpdGVhL3dlYnNpdGUKICAgICAgLSBnby1naXRlYS9ibG9nCiAgICAgIC0gZ28tZ2l0ZWEvZG9jcwogICAgICAtIGdvLWdpdGVhL3JlZGlyZWN0cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1c2gKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCg.JvhvP3thB6HoDuHhdT7XP9Cqlk7KsYU7L4oyjXZv8O0 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 066ebdf..6f5c55c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +/dist/ /node_modules/ /static/styles/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2b505b9 --- /dev/null +++ b/Makefile @@ -0,0 +1,31 @@ +STYLES := static/styles +DIST := dist + +.PHONY: all +all: build + +.PHONY: clean +clean: + rm -rf $(STYLES) $(DIST) + +.PHONY: install +install: + npm install -q + npm install -q -g gulp-cli + +.PHONY: build +build: + gulp + +.PHONY: release +release: + mkdir -p dist/ + cp -r archetypes/ dist/ + cp -r i18n/ dist/ + cp -r layouts/ dist/ + cp -r static/ dist/ + cp -r DCO dist/ + cp -r LICENSE dist/ + cp -r MAINTAINERS dist/ + cp -r README.md dist/ + cp -r theme.toml dist/ From 339a3c487cbd4c91352564bc8b1c435731764bfc Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Wed, 7 Dec 2016 23:39:21 +0100 Subject: [PATCH 5/9] make release creates a .tar.gz directly --- .gitignore | 1 + Makefile | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 6f5c55c..3b1842f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /dist/ +/master.tar.gz /node_modules/ /static/styles/ diff --git a/Makefile b/Makefile index 2b505b9..d2b32dd 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,11 @@ STYLES := static/styles -DIST := dist .PHONY: all all: build .PHONY: clean clean: - rm -rf $(STYLES) $(DIST) + rm -rf $(STYLES) master.tar.gz .PHONY: install install: @@ -19,13 +18,13 @@ build: .PHONY: release release: - mkdir -p dist/ - cp -r archetypes/ dist/ - cp -r i18n/ dist/ - cp -r layouts/ dist/ - cp -r static/ dist/ - cp -r DCO dist/ - cp -r LICENSE dist/ - cp -r MAINTAINERS dist/ - cp -r README.md dist/ - cp -r theme.toml dist/ + tar -cvzf master.tar.gz \ + archetypes/ \ + i18n/ \ + layouts/ \ + static/ \ + DCO \ + LICENSE \ + MAINTAINERS \ + README.md \ + theme.toml From 663c9f0a9fcab3586bd4319b0962831b0742187a Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Wed, 7 Dec 2016 23:44:35 +0100 Subject: [PATCH 6/9] Push the master.tar.gz to /theme/ on minio --- .drone.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index c133cd6..ea55872 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,9 +12,8 @@ pipeline: release: image: plugins/s3 path_style: true - strip_prefix: dist/ - source: dist/* - target: /theme/master + source: master.tar.gz + target: /theme/ when: event: [ push ] branch: [ master ] From 4a44293cef531f20f6cee78a7c8be31e4122188e Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Wed, 7 Dec 2016 23:48:43 +0100 Subject: [PATCH 7/9] drone sign --- .drone.yml.sig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml.sig b/.drone.yml.sig index 1113d80..78ddf5d 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogbm9kZQogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBpbnN0YWxsCiAgICAgIC0gbWFrZSBidWlsZAogICAgICAtIG1ha2UgcmVsZWFzZQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC8KICAgIHNvdXJjZTogZGlzdC8qCiAgICB0YXJnZXQ6IC90aGVtZS9tYXN0ZXIKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgbWFzdGVyIF0KCiAgZG93bnN0cmVhbToKICAgIGltYWdlOiBwbHVnaW5zL2Rvd25zdHJlYW0KICAgIHNlcnZlcjogaHR0cHM6Ly9kcm9uZS5naXRlYS5pbwogICAgcmVwb3NpdG9yaWVzOgogICAgICAtIGdvLWdpdGVhL3dlYnNpdGUKICAgICAgLSBnby1naXRlYS9ibG9nCiAgICAgIC0gZ28tZ2l0ZWEvZG9jcwogICAgICAtIGdvLWdpdGVhL3JlZGlyZWN0cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IHB1c2gKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCg.JvhvP3thB6HoDuHhdT7XP9Cqlk7KsYU7L4oyjXZv8O0 \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogbm9kZQogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBpbnN0YWxsCiAgICAgIC0gbWFrZSBidWlsZAogICAgICAtIG1ha2UgcmVsZWFzZQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHNvdXJjZTogbWFzdGVyLnRhci5negogICAgdGFyZ2V0OiAvdGhlbWUvCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIGRvd25zdHJlYW06CiAgICBpbWFnZTogcGx1Z2lucy9kb3duc3RyZWFtCiAgICBzZXJ2ZXI6IGh0dHBzOi8vZHJvbmUuZ2l0ZWEuaW8KICAgIHJlcG9zaXRvcmllczoKICAgICAgLSBnby1naXRlYS93ZWJzaXRlCiAgICAgIC0gZ28tZ2l0ZWEvYmxvZwogICAgICAtIGdvLWdpdGVhL2RvY3MKICAgICAgLSBnby1naXRlYS9yZWRpcmVjdHMKICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCiAgICAgIGJyYW5jaDogbWFzdGVyCgogIGdpdHRlcjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdHRlcgo.jBQghW1AiJ_OebYrInMacj8TxPJc9XWha40GiafSsaE \ No newline at end of file From 2a1c23d3a71f4dbc54aa3b60a0b86fa2eede8d48 Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Thu, 8 Dec 2016 00:07:31 +0100 Subject: [PATCH 8/9] Remove obsolete /dist from .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3b1842f..5c350cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/dist/ /master.tar.gz /node_modules/ /static/styles/ From 731cc07aa4dba1384dd6248ba7a50cfe8c0251ff Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Thu, 8 Dec 2016 16:41:10 +0100 Subject: [PATCH 9/9] My tiny changes --- .drone.yml | 20 +++++++++++--------- .drone.yml.sig | 2 +- .gitignore | 2 +- Makefile | 30 ------------------------------ gulpfile.js | 33 ++++++++++++++++++++++++++++++--- package.json | 28 +++++++++++++++++++++------- 6 files changed, 64 insertions(+), 51 deletions(-) delete mode 100644 Makefile diff --git a/.drone.yml b/.drone.yml index ea55872..2449609 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,22 +3,24 @@ workspace: pipeline: build: - image: node + image: library/node:latest commands: - - make install - - make build - - make release + - npm install -q + - npm run clean + - npm run build + - npm run release release: image: plugins/s3 path_style: true - source: master.tar.gz - target: /theme/ + strip_prefix: dist/ + source: dist/master.tar.gz + target: /theme when: event: [ push ] branch: [ master ] - downstream: + trigger: image: plugins/downstream server: https://drone.gitea.io repositories: @@ -27,8 +29,8 @@ pipeline: - go-gitea/docs - go-gitea/redirects when: - event: push - branch: master + event: [ push ] + branch: [ master ] gitter: image: plugins/gitter diff --git a/.drone.yml.sig b/.drone.yml.sig index 78ddf5d..c146448 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogbm9kZQogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSBpbnN0YWxsCiAgICAgIC0gbWFrZSBidWlsZAogICAgICAtIG1ha2UgcmVsZWFzZQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHNvdXJjZTogbWFzdGVyLnRhci5negogICAgdGFyZ2V0OiAvdGhlbWUvCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIGRvd25zdHJlYW06CiAgICBpbWFnZTogcGx1Z2lucy9kb3duc3RyZWFtCiAgICBzZXJ2ZXI6IGh0dHBzOi8vZHJvbmUuZ2l0ZWEuaW8KICAgIHJlcG9zaXRvcmllczoKICAgICAgLSBnby1naXRlYS93ZWJzaXRlCiAgICAgIC0gZ28tZ2l0ZWEvYmxvZwogICAgICAtIGdvLWdpdGVhL2RvY3MKICAgICAgLSBnby1naXRlYS9yZWRpcmVjdHMKICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCiAgICAgIGJyYW5jaDogbWFzdGVyCgogIGdpdHRlcjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdHRlcgo.jBQghW1AiJ_OebYrInMacj8TxPJc9XWha40GiafSsaE \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIHBhdGg6IHNyYwoKcGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogbGlicmFyeS9ub2RlOmxhdGVzdAogICAgY29tbWFuZHM6CiAgICAgIC0gbnBtIGluc3RhbGwgLXEKICAgICAgLSBucG0gcnVuIGNsZWFuCiAgICAgIC0gbnBtIHJ1biBidWlsZAogICAgICAtIG5wbSBydW4gcmVsZWFzZQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC8KICAgIHNvdXJjZTogZGlzdC9tYXN0ZXIudGFyLmd6CiAgICB0YXJnZXQ6IC90aGVtZQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICB0cmlnZ2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG93bnN0cmVhbQogICAgc2VydmVyOiBodHRwczovL2Ryb25lLmdpdGVhLmlvCiAgICByZXBvc2l0b3JpZXM6CiAgICAgIC0gZ28tZ2l0ZWEvd2Vic2l0ZQogICAgICAtIGdvLWdpdGVhL2Jsb2cKICAgICAgLSBnby1naXRlYS9kb2NzCiAgICAgIC0gZ28tZ2l0ZWEvcmVkaXJlY3RzCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIGdpdHRlcjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdHRlcgo.N2Jze2NItEHFkItBvnoEO6Iw15Ar3kWd2QyJj5wByHo \ No newline at end of file diff --git a/.gitignore b/.gitignore index 5c350cc..c291388 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/master.tar.gz /node_modules/ +/dist/ /static/styles/ diff --git a/Makefile b/Makefile deleted file mode 100644 index d2b32dd..0000000 --- a/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -STYLES := static/styles - -.PHONY: all -all: build - -.PHONY: clean -clean: - rm -rf $(STYLES) master.tar.gz - -.PHONY: install -install: - npm install -q - npm install -q -g gulp-cli - -.PHONY: build -build: - gulp - -.PHONY: release -release: - tar -cvzf master.tar.gz \ - archetypes/ \ - i18n/ \ - layouts/ \ - static/ \ - DCO \ - LICENSE \ - MAINTAINERS \ - README.md \ - theme.toml diff --git a/gulpfile.js b/gulpfile.js index fa4d535..6928278 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,8 +1,30 @@ var gulp = require('gulp'); var sass = require('gulp-sass'); var sourcemaps = require('gulp-sourcemaps'); +var tar = require('gulp-tar'); +var gzip = require('gulp-gzip'); +var clean = require('gulp-clean'); -gulp.task('default', ['sass']); +var sources = [ + 'archetypes', + 'i18n', + 'layouts', + 'static', + 'DCO', + 'LICENSE', + 'README.md', + 'theme.toml' +]; + +gulp.task('default', ['build']); +gulp.task('build', ['sass']); + +gulp.task('release', function () { + return gulp.src(sources) + .pipe(tar('master.tar')) + .pipe(gzip()) + .pipe(gulp.dest('dist')) +}); gulp.task('sass', function () { return gulp.src('./src/main.scss') @@ -12,6 +34,11 @@ gulp.task('sass', function () { .pipe(gulp.dest('./static/styles')); }); -gulp.task('watch', function () { - gulp.watch('./src/*.scss', ['sass']); +gulp.task('clean', function () { + return gulp.src(['dist', 'static/styles']) + .pipe(clean()); +}); + +gulp.task('watch', function () { + return gulp.watch('./src/*.scss', ['sass']); }); diff --git a/package.json b/package.json index cff2a65..ab8fb79 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,36 @@ { "name": "gitea-theme", - "description": "This is a Hugo theme that gets used within all of our websites like our blog, documentation and also the redirects.", + "version": "0.0.0", + "description": "A Hugo theme that gets used within all of our websites.", + "homepage": "https://github.com/go-gitea/theme#readme", + "license": "Apache-2.0", + "author": { + "name": "The Gitea Authors", + "email": "team@gitea.io" + }, "repository": { "type": "git", - "url": "git+https://github.com/go-gitea/theme.git" + "url": "https://github.com/go-gitea/theme.git" }, - "author": "The Gitea Authors", - "license": "Apache-2.0", "bugs": { - "url": "https://github.com/go-gitea/theme/issues" + "url": "https://github.com/go-gitea/theme/issues", + "email": "team@gitea.io" + }, + "scripts": { + "clean": "gulp clean", + "build": "gulp build", + "release": "gulp release", + "watch": "gulp watch" }, - "homepage": "https://github.com/go-gitea/theme#readme", "dependencies": { "bootstrap": "^4.0.0-alpha.5" }, "devDependencies": { "gulp": "^3.9.1", + "gulp-clean": "^0.3.2", + "gulp-gzip": "^1.4.0", "gulp-sass": "^2.3.2", - "gulp-sourcemaps": "^1.9.1" + "gulp-sourcemaps": "^1.9.1", + "gulp-tar": "^1.9.0" } }