Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
itzCozi committed Apr 22, 2024
2 parents 343adb8 + 9bd5f30 commit 8e3f1a4
Show file tree
Hide file tree
Showing 46 changed files with 2,814 additions and 370 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Sync fork

permissions:
contents: write

on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
sync:
name: Sync fork
runs-on: ubuntu-latest
if: ${{ github.event.repository.fork }}

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Sync fork
run: gh repo sync ${{ github.repository }}
env:
GH_TOKEN: ${{ github.token }}

- uses: gautamkrishnar/keepalive-workflow@v1
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ ARG ONBOARDING_PROXY_INSTALL_LINK
ARG DISALLOWED_IDS
ARG CDN_REPLACEMENTS
ARG TURNSTILE_KEY
ARG ALLOW_AUTOPLAY="false"

ENV VITE_PWA_ENABLED=${PWA_ENABLED}
ENV VITE_GA_ID=${GA_ID}
Expand All @@ -39,6 +40,7 @@ ENV VITE_ONBOARDING_PROXY_INSTALL_LINK=${ONBOARDING_PROXY_INSTALL_LINK}
ENV VITE_DISALLOWED_IDS=${DISALLOWED_IDS}
ENV VITE_CDN_REPLACEMENTS=${CDN_REPLACEMENTS}
ENV VITE_TURNSTILE_KEY=${TURNSTILE_KEY}
ENV VITE_ALLOW_AUTOPLAY=${ALLOW_AUTOPLAY}

COPY . ./
RUN pnpm run build
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "movie-web",
"version": "4.6.2",
"version": "4.7.0",
"private": true,
"homepage": "https://github.com/movie-web/movie-web",
"scripts": {
Expand Down Expand Up @@ -29,7 +29,7 @@
"@formkit/auto-animate": "^0.8.1",
"@headlessui/react": "^1.7.17",
"@ladjs/country-language": "^1.0.3",
"@movie-web/providers": "^2.2.3",
"@movie-web/providers": "^2.3.0",
"@noble/hashes": "^1.3.3",
"@plasmohq/messaging": "^0.6.1",
"@react-spring/web": "^9.7.3",
Expand Down Expand Up @@ -120,7 +120,7 @@
"tailwindcss-themer": "^4.0.0",
"type-fest": "^4.8.3",
"typescript": "^5.3.3",
"vite": "^5.0.12",
"vite": "^5.0.13",
"vite-plugin-checker": "^0.6.2",
"vite-plugin-package-version": "^1.1.0",
"vite-plugin-pwa": "^0.17.4",
Expand Down
Loading

0 comments on commit 8e3f1a4

Please sign in to comment.