diff --git a/.github/workflows/build-cordova.yml b/.github/workflows/build-cordova.yml index c95cb15c..d3ef4bcb 100644 --- a/.github/workflows/build-cordova.yml +++ b/.github/workflows/build-cordova.yml @@ -18,8 +18,7 @@ on: push: branches: - - "v4" - - "master" + - "main" - "feature/**" - "fix/**" paths: diff --git a/.github/workflows/build-electron.yml b/.github/workflows/build-electron.yml index 84543517..547d57a6 100644 --- a/.github/workflows/build-electron.yml +++ b/.github/workflows/build-electron.yml @@ -19,8 +19,7 @@ on: push: branches: - - "v4" - - "master" + - "main" - "feature/**" - "fix/**" paths: diff --git a/.github/workflows/build-tauri.yml b/.github/workflows/build-tauri.yml index dcad749a..470760e2 100644 --- a/.github/workflows/build-tauri.yml +++ b/.github/workflows/build-tauri.yml @@ -9,8 +9,7 @@ on: push: branches: - - "v4" - - "master" + - "main" - "feature/**" - "fix/**" paths: diff --git a/.github/workflows/build-web-extension.yml b/.github/workflows/build-web-extension.yml index 65aba42d..c47ad9ef 100644 --- a/.github/workflows/build-web-extension.yml +++ b/.github/workflows/build-web-extension.yml @@ -14,8 +14,7 @@ on: push: branches: - - "v4" - - "master" + - "main" - "feature/**" - "fix/**" paths: diff --git a/.github/workflows/update-deployment.yml b/.github/workflows/update-deployment.yml index 04e912c3..87c96a43 100644 --- a/.github/workflows/update-deployment.yml +++ b/.github/workflows/update-deployment.yml @@ -5,8 +5,7 @@ on: push: branches: - - "v4" - - "master" + - "main" paths: - "packages/app/**" - "packages/core/**" diff --git a/docs/checksums/web/README.md b/docs/checksums/web/README.md index 65ed859d..99d9ea64 100644 --- a/docs/checksums/web/README.md +++ b/docs/checksums/web/README.md @@ -14,15 +14,15 @@ Windows systems, we suggest you run them via WSL2. ```bash git clone git@github.com:padloc/padloc.git && \ cd padloc && \ - git pull origin/v4 && \ + git pull origin/main && \ npm install ``` -2. Build code (replace `beta.padloc.app` with whatever domain you're trying to +2. Build code (replace `web.padloc.app` with whatever domain you're trying to check, if not padloc's production): ```bash - PL_PWA_URL=https://beta.padloc.app \ + PL_PWA_URL=https://web.padloc.app \ PL_SERVER_URL=$PL_PWA_URL/server/ \ npm run pwa:build ``` @@ -163,11 +163,11 @@ Windows systems, we suggest you run them via WSL2. ## Verify what you're using has the same source code -1. Download a website (replace `beta.padloc.app` with whatever domain you're +1. Download a website (replace `web.padloc.app` with whatever domain you're trying to check), and all the relevant files: ```bash - HOST_TO_CHECK=beta.padloc.app && \ + HOST_TO_CHECK=web.padloc.app && \ wget -r -p -U Mozilla https://$HOST_TO_CHECK && \ cd $HOST_TO_CHECK && \ wget https://github.com/padloc/padloc/releases/latest/download/parse-csp.ts && \