Skip to content

Commit 86a12a1

Browse files
committed
Merge branch 'develop' into feature/use-pnpm
# Conflicts: # .github/dependabot.yml # .github/workflows/gh-pages.yml
2 parents 7538767 + 8feaeeb commit 86a12a1

3 files changed

Lines changed: 39 additions & 10 deletions

File tree

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ updates:
3131
directory: /
3232
schedule:
3333
interval: monthly
34+
groups:
35+
github-actions:
36+
patterns:
37+
- "*"

.github/workflows/gh-pages.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1313
with:
1414
submodules: true
1515
- name: Setup Pages
16-
uses: actions/configure-pages@v5
16+
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
1717
- name: Setup Hugo
18-
uses: peaceiris/actions-hugo@v3
18+
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
1919
with:
2020
hugo-version: '0.148.1'
2121
extended: true
22-
- uses: pnpm/action-setup@v4
23-
- uses: actions/setup-node@v4
22+
- uses: pnpm/action-setup@v4 #TODO
23+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2424
with:
2525
node-version: 22
2626
cache: 'pnpm'
@@ -38,12 +38,12 @@ jobs:
3838
- name: Add robots.txt for staging
3939
run: 'echo -e "User-agent: *\nDisallow: /" > public/staging/robots.txt'
4040
- name: Upload Prod Pages artifact
41-
uses: actions/upload-pages-artifact@v3
41+
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
4242
with:
4343
name: prod-site
4444
path: ./public/prod
4545
- name: Upload Staging artifacts
46-
uses: actions/upload-artifact@v4
46+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4747
with:
4848
name: staging-site
4949
path: ./public/staging
@@ -60,7 +60,7 @@ jobs:
6060
steps:
6161
- name: Deploy to GitHub Pages
6262
id: deployment
63-
uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
63+
uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
6464
with:
6565
artifact_name: prod-site
6666
environment: # Deploy to the github-pages environment
@@ -75,12 +75,12 @@ jobs:
7575
needs: [build]
7676
steps:
7777
- name: Download build
78-
uses: actions/download-artifact@v4
78+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
7979
with:
8080
name: staging-site
8181
path: ./public
8282
- name: Deploy to Staging Repository
83-
uses: peaceiris/actions-gh-pages@v3
83+
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
8484
with:
8585
personal_token: ${{ secrets.CRYPTOBOT_DEPLOY_STAGING_WEBSITE }}
8686
external_repository: cryptomator/staging.cryptomator.github.io

layouts/downloads/list.html

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,31 @@
2323
</section>
2424
</div>
2525

26+
<section class="bg-dark text-white py-12 md:py-16 lg:py-20">
27+
<div class="container flex items-center">
28+
<div class="hidden pr-6 md:block md:w-1/3 lg:w-2/5">
29+
<img data-src="/img/hub/group-magic.png" class="lazyload object-scale-down mx-auto lg:w-3/4" alt="{{ i18n "hub_header_group_magic_alt" . }}"/>
30+
</div>
31+
<div class="w-full md:w-2/3 lg:w-3/5">
32+
<div class="flex items-center mb-4">
33+
<img src="/img/logo.svg" class="h-7 aspect-1110/942" alt="Logo"/>
34+
<span class="font-headline font-bold text-primary ml-2 pb-px">CRYPTOMATOR HUB</span>
35+
</div>
36+
<h2 class="font-h2 text-white mb-4">{{ i18n "hub_header_title" . | safeHTML }}</h2>
37+
<p class="font-p text-gray-300 mb-6">{{ i18n "hub_header_description" . | safeHTML }}</p>
38+
<div class="flex flex-col lg:flex-row gap-3 mb-3">
39+
<a href="{{ .Site.LanguagePrefix }}/hub/managed/" role="button" class="btn btn-primary px-8" data-umami-event="downloads-hub-managed-cta">
40+
<i class="fa-solid fa-cloud"></i> {{ i18n "pricing_hub_managed_cta" . }}
41+
</a>
42+
<a href="{{ .Site.LanguagePrefix }}/hub/self-hosted/" role="button" class="btn btn-outline-primary px-8" data-umami-event="downloads-hub-self-hosted-cta">
43+
<i class="fa-solid fa-server"></i> {{ i18n "pricing_hub_self_hosted_cta" . }}
44+
</a>
45+
</div>
46+
<p class="font-p text-sm text-gray-400">{{ i18n "hub_header_managed_cta_description" . | safeHTML }}</p>
47+
</div>
48+
</div>
49+
</section>
50+
2651
<section class="container text-center py-12">
2752
<h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">{{ i18n "downloads_all_versions_title" . }}</h3>
2853
<a href="https://github.com/cryptomator/cryptomator/releases" target="_blank" rel="noopener" role="button" class="btn btn-outline-primary px-8" data-umami-event="downloads-all-versions">

0 commit comments

Comments
 (0)