branch: elpa/emacsql
commit 6f9749cf5c4dd31d0befc40b3367b3dca582cbe0
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>

    Publish manual and statistics using webdav
---
 .github/workflows/stats.yml | 3 +--
 default.mk                  | 7 ++-----
 docs/Makefile               | 9 ++++-----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/stats.yml b/.github/workflows/stats.yml
index e941fb95884..5597fb9732b 100644
--- a/.github/workflows/stats.yml
+++ b/.github/workflows/stats.yml
@@ -9,5 +9,4 @@ jobs:
     name: Statistics
     uses: emacscollective/workflows/.github/workflows/stats.yml@main
     secrets:
-      aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      rclone_config: ${{ secrets.RCLONE_CONFIG }}
diff --git a/default.mk b/default.mk
index fbd8602ccc1..a414dc3ce9f 100644
--- a/default.mk
+++ b/default.mk
@@ -34,15 +34,12 @@ EMACS_Q_ARG ?= -Q
 EMACS_BATCH ?= $(EMACS) $(EMACS_Q_ARG) --batch $(EMACS_ARGS) $(LOAD_PATH)
 EMACS_INTR  ?= $(EMACS) $(EMACS_Q_ARG) $(EMACS_ARGS) $(LOAD_PATH)
 
-ifeq ($(CI), true)
-override GITSTATS = ../_gitstats/gitstats
-endif
 GITSTATS      ?= gitstats
 GITSTATS_DIR  ?= stats
 GITSTATS_ARGS ?= -c style=https://magit.vc/assets/stats.css -c max_authors=999
 
-CFRONT_DIST ?= E2LUHBKU1FBV02
-S3_BUCKET   ?= s3://$(DOMAIN)
+RCLONE      ?= rclone
+RCLONE_ARGS ?= -v
 
 ifdef NIX_PATH
 export SQLITE3_API_BUILD_COMMAND = nix-shell -p sqlite.dev --run "make all"
diff --git a/docs/Makefile b/docs/Makefile
index a8dc0926219..677a7ea0784 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,17 +3,16 @@ include ../default.mk
 
 .PHONY: stats
 
+STAT_DOMAIN = stats.$(DOMAIN)
+STAT_TARGET = $(subst .,_,$(STAT_DOMAIN)):$(PKG)/
+
 stats:
        @printf "Generating statistics...\n"
        @$(GITSTATS) $(GITSTATS_ARGS) $(TOP) $(GITSTATS_DIR)
 
 stats-upload:
        @printf "Uploading statistics...\n"
-       @aws s3 sync $(GITSTATS_DIR) $(S3_BUCKET)/stats/$(PKG)
-       @printf "Uploaded to $(S3_BUCKET)/stats/$(PKG)\n"
-       @printf "Generating CDN invalidation\n"
-       @aws cloudfront create-invalidation \
-       --distribution-id $(CFRONT_DIST) --paths "/stats/*" > /dev/null
+       @$(RCLONE) sync $(RCLONE_ARGS) stats $(STAT_TARGET)
 
 CLEAN = stats
 

Reply via email to