Fix prod deployment cache issue and analytics templating

This commit is contained in:
Keavon Chambers 2023-08-12 13:16:49 -07:00
parent fd338c945f
commit cfe38c6413
3 changed files with 19 additions and 3 deletions

View file

@ -9,6 +9,7 @@ on:
- master - master
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
INDEX_HTML_HEAD_REPLACEMENT: <script defer data-domain="dev.graphite.rs" data-api="https://graphite.rs/visit/event" src="https://graphite.rs/visit/script.outbound-links.file-downloads.js"></script>
jobs: jobs:
build: build:
@ -44,6 +45,12 @@ jobs:
rustup update stable rustup update stable
rustc --version rustc --version
- name: Replace template in <head> of index.html
run: |
# Remove the INDEX_HTML_HEAD_REPLACEMENT environment variable for build links (not master deploys)
git rev-parse --abbrev-ref HEAD | grep master > /dev/null || export INDEX_HTML_HEAD_REPLACEMENT=""
sed -i "s|<!-- INDEX_HTML_HEAD_REPLACEMENT -->|$INDEX_HTML_HEAD_REPLACEMENT|" frontend/index.html
- name: 🌐 Build Graphite web code - name: 🌐 Build Graphite web code
env: env:
NODE_ENV: production NODE_ENV: production
@ -58,8 +65,8 @@ jobs:
with: with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: graphite-dev # e.g. 'my-project' projectName: graphite-dev
directory: frontend/dist # e.g. 'dist' directory: frontend/dist
gitHubToken: ${{ secrets.GITHUB_TOKEN }} gitHubToken: ${{ secrets.GITHUB_TOKEN }}
- name: 👕 Lint Graphite web formatting - name: 👕 Lint Graphite web formatting

View file

@ -18,10 +18,14 @@ jobs:
RUSTC_WRAPPER: /usr/bin/sccache RUSTC_WRAPPER: /usr/bin/sccache
CARGO_INCREMENTAL: 0 CARGO_INCREMENTAL: 0
SCCACHE_DIR: /var/lib/github-actions/.cache SCCACHE_DIR: /var/lib/github-actions/.cache
INDEX_HTML_HEAD_REPLACEMENT: <script defer data-domain="editor.graphite.rs" data-api="https://graphite.rs/visit/event" src="https://graphite.rs/visit/script.outbound-links.file-downloads.js"></script>
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: 🔧 Clear wasm-bindgen cache
run: rm -r ~/.cache/.wasm-pack
- name: 🔧 Set up Node - name: 🔧 Set up Node
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
@ -38,6 +42,10 @@ jobs:
rustup update stable rustup update stable
rustc --version rustc --version
- name: Replace template in <head> of index.html
run: |
sed -i "s|<!-- INDEX_HTML_HEAD_REPLACEMENT -->|$INDEX_HTML_HEAD_REPLACEMENT|" frontend/index.html
- name: 🌐 Build Graphite web code - name: 🌐 Build Graphite web code
env: env:
NODE_ENV: production NODE_ENV: production
@ -53,4 +61,5 @@ jobs:
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: graphite-editor projectName: graphite-editor
directory: frontend/dist directory: frontend/dist
branch: master
gitHubToken: ${{ secrets.GITHUB_TOKEN }} gitHubToken: ${{ secrets.GITHUB_TOKEN }}

View file

@ -9,7 +9,6 @@
<link rel="icon" type="image/png" sizes="16x16" href="public/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="public/favicon-16x16.png">
<link rel="manifest" href="/public/site.webmanifest"> <link rel="manifest" href="/public/site.webmanifest">
<link rel="mask-icon" href="/public/safari-pinned-tab.svg" color="#473a3a"> <link rel="mask-icon" href="/public/safari-pinned-tab.svg" color="#473a3a">
<script defer data-domain="dev.graphite.rs" data-api="https://graphite.rs/visit/event" src="https://graphite.rs/visit/script.outbound-links.file-downloads.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=0.5, maximum-scale=0.5, minimum-scale=0.5"> <meta name="viewport" content="width=device-width, initial-scale=0.5, maximum-scale=0.5, minimum-scale=0.5">
<meta name="apple-mobile-web-app-title" content="Graphite"> <meta name="apple-mobile-web-app-title" content="Graphite">
<meta name="application-name" content="Graphite"> <meta name="application-name" content="Graphite">
@ -17,6 +16,7 @@
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<meta name="color-scheme" content="dark only"> <meta name="color-scheme" content="dark only">
<meta name="darkreader-lock"> <meta name="darkreader-lock">
<!-- INDEX_HTML_HEAD_REPLACEMENT -->
</head> </head>
<body> <body>
<noscript>JavaScript is required</noscript> <noscript>JavaScript is required</noscript>