diff --git a/.drone.yml b/.drone.yml index 195d482..fe8ac84 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,9 +15,10 @@ steps: path: /drone/cache/ commands: - ls -la /drone/cache/.m2 - - clj -Sdeps '{:mvn/local-repo "/drone/cache/.m2/repository"}' -P -M:shadow-cljs-run + - clj -Sdeps '{:mvn/local-repo "/drone/cache/.m2/repository"}' -P -M:blog:clojure-demos:dev:shadow-cljs-run - - name: build-clojure + # --- Blog --- + - name: build-blog pull: always image: clojure:tools-deps depends_on: @@ -27,44 +28,13 @@ steps: - name: cache path: /drone/cache/ commands: - - ls -la /drone/cache/.m2 - - clj -Sdeps '{:mvn/local-repo "/drone/cache/.m2/repository"}' -Mshadow-cljs-run release app --debug - - # - name: deploy-site - # pull: True - # image: appleboy/drone-scp - # depends_on: - # - build-clojure - # settings: - # host: blog.digitaloctave.com - # port: 22 - # username: - # from_secret: ssh_user - # key: - # from_secret: ssh_key - # target: /var/www/portfolio/${DRONE_COMMIT_SHA:0:10}/ - # source: /drone/src/development/resources/public/* - # strip_components: 5 - - - name: build-static-blog - pull: always - image: clojure:tools-deps - depends_on: - - fetch-clojure-deps - - fetch-npm-deps - volumes: - - name: cache - path: /drone/cache/ - commands: - - ls -la /drone/cache/.m2 - clj -M:blog:shadow-cljs-run release blog - #- clj -Sdeps '{:mvn/local-repo "/drone/cache/.m2/repository"}' -Mshadow-cljs-run release app --debug - - name: deploy-static-blog + - name: deploy-blog pull: True image: appleboy/drone-scp depends_on: - - build-static-blog + - build-blog settings: host: blog.digitaloctave.com port: 22 @@ -76,24 +46,63 @@ steps: source: /drone/src/bases/do-blog/resources/public/* strip_components: 6 - # - name: promote-deployed-site - # pull: True - # image: appleboy/drone-ssh - # depends_on: - # - deploy-site - # settings: - # host: blog.digitaloctave.com - # port: 22 - # username: - # from_secret: SSH_USER - # key: - # from_secret: SSH_KEY - # port: 22 - # command_timeout: 5m - # script: - # - cd /var/www/portfolio/ - # - rm /var/www/portfolio/promoted - # - ln -s /var/www/portfolio/${DRONE_COMMIT_SHA:0:10} /var/www/portfolio/promoted + # --- Clojure Demos --- + - name: build-clojure-demos + pull: always + image: clojure:tools-deps + depends_on: + - fetch-clojure-deps + - fetch-npm-deps + volumes: + - name: cache + path: /drone/cache/ + commands: + - clj -M:clojure-demos:shadow-cljs-run release clojure-demos + + - name: deploy-clojure-demos + pull: True + image: appleboy/drone-scp + depends_on: + - build-clojure-demos + settings: + host: clojure-demos.digitaloctave.com + port: 22 + username: + from_secret: ssh_user + key: + from_secret: ssh_key + target: /var/www/clojure-demos/ + source: /drone/src/bases/clojure-demos/resources/public/* + strip_components: 6 + + # --- Portfolio --- + - name: build-portfolio + pull: always + image: clojure:tools-deps + depends_on: + - fetch-clojure-deps + - fetch-npm-deps + volumes: + - name: cache + path: /drone/cache/ + commands: + - clj -M:dev:shadow-cljs-run release ui + + - name: deploy-portfolio + pull: True + image: appleboy/drone-scp + depends_on: + - build-portfolio + settings: + host: digitaloctave.com + port: 22 + username: + from_secret: ssh_user + key: + from_secret: ssh_key + target: /var/www/portfolio/ + source: /drone/src/development/resources/public/* + strip_components: 5 volumes: - name: cache diff --git a/package.json b/package.json index 0c8e4fc..99f412d 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "dependencies": { "@js-joda/core": "^3.2.0", "@js-joda/locale_en-us": "^3.2.2", - "@js-joda/timezone": "^2.18.0", + "@js-joda/timezone": "2.23.0", "@sentry/browser": "^6.18.1", "@sentry/react": "^6.19.7", "@sentry/tracing": "^6.19.7",