Skip to content

Commit 7ffae2e

Browse files
committed
workflow: simplify workflow
1 parent 4a39565 commit 7ffae2e

File tree

5 files changed

+14
-105
lines changed

5 files changed

+14
-105
lines changed

.github/workflows/deploy-dev-docs.yaml

Lines changed: 0 additions & 98 deletions
This file was deleted.

.github/workflows/deploy-docs.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Deploy Docs
33
on:
44
push:
55
branches:
6+
- develop
7+
- website
68
- master
79
paths:
810
- "**/*.md"
@@ -14,6 +16,7 @@ on:
1416
- "**/*.jpeg"
1517
- "**/*.gif"
1618
- "**/*.svg"
19+
- "package.json"
1720

1821
workflow_dispatch:
1922

@@ -49,6 +52,8 @@ jobs:
4952
run: |
5053
./docgen -panic -warning -config gen/docgen.yaml
5154
mv -v *.md *.svg docs/
55+
mkdir -p gen/vuepress/public/images
56+
cp -vR images/* gen/vuepress/public/images
5257
mv -v gen/vuepress docs/.vuepress
5358
5459
echo Lower case documents...
@@ -70,6 +75,7 @@ jobs:
7075
- name: Build Docs
7176
env:
7277
NODE_OPTIONS: --max_old_space_size=8192
78+
NODE_ENV: DEV
7379
run: |-
7480
pnpm run docs:build
7581
> docs/.vuepress/dist/.nojekyll
@@ -79,14 +85,15 @@ jobs:
7985
cp -v docs/.vuepress/dist/install.html docs/.vuepress/dist/INSTALL.html
8086
cp -v docs/.vuepress/dist/download.html docs/.vuepress/dist/DOWNLOAD.html
8187
cp -v docs/.vuepress/dist/contributing.html docs/.vuepress/dist/CONTRIBUTING.html
82-
88+
8389
- name: Deploy Docs
8490
env:
8591
AWS_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS }}
8692
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET }}
8793
AWS_DEFAULT_REGION: eu-west-1
8894
AWS_DEFAULT_OUTPUT: json
95+
CLOUDFRONT_ID: ${{ github.ref == 'refs/heads/master' && secrets.CLOUDFRONT_DISTRIBUTION_ID_MASTER || secrets.CLOUDFRONT_DISTRIBUTION_ID_DEV }}
8996
run: |
90-
mv -v images/*.gif docs/.vuepress/dist
91-
aws s3 sync docs/.vuepress/dist s3://murex.rocks/master --exclude "*.md" --no-progress
92-
aws cloudfront create-invalidation --distribution-id "${{ secrets.CLOUDFRONT_DISTRIBUTION_ID_MASTER }}" --paths "/*"
97+
aws s3 sync docs/.vuepress/dist s3://murex.rocks/develop --exclude "*.md" --no-progress --delete
98+
aws cloudfront create-invalidation --distribution-id "${CLOUDFRONT_ID}" --paths "/*"
99+

app/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const Name = "murex"
1717
const (
1818
Major = 7
1919
Minor = 1
20-
Revision = 4139
20+
Revision = 4140
2121
)
2222

2323
var (

builtins/docs/summaries.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ func init() {
422422
"changelog/v6.3": "This is a massive release ahead of the v7.0. This brings notifications of new deprecations, new builtins, new flags, improved CI/CD flow, and changes to the website. Unfortunately it also carries 3 breaking changes.",
423423
"changelog/v6.4": "This change brings a number of ergonomic improvements to job control, `datetime` and working with structures.",
424424
"changelog/v7.0": "Introducing experimental support for XML, new integrations, and several other quality-of-life improvements. Four deprecated builtins have been removed too, which is this release sees an increment of its major version number",
425-
"changelog/v7.1": "This release focuses mainly on bugfixes and quality-of-life with the exception of three **experimental** new major additions: - `foreach` now supports running processes in parallel - `fanout` is a new builtin that allows sending stdout to the stdin of many processes - `md` is a new datatype added. Currently only supports rendering markdown tables but more features will follow in future releases",
425+
"changelog/v7.1": "This release focuses mainly on bugfixes and quality-of-life with the exception of three **experimental** new major additions:\n* `foreach` now supports running processes in parallel\n* `fanout` is a new builtin that allows sending stdout to the stdin of many processes\n* `md` is a new datatype added. Currently only supports rendering markdown tables but more features will follow in future releases",
426426
"deprecated/equ": "Evaluate a mathematical function (removed 7.0)",
427427
"deprecated/die": "Terminate murex with an exit number of 1 (removed 7.0)",
428428
"deprecated/let": "Evaluate a mathematical function and assign to variable (removed 7.0)",

version.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)