Skip to content

Commit d61b0cf

Browse files
Merge branch 'trunk' into feature/theme
2 parents dc43435 + 77bcf4b commit d61b0cf

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/deploy-vendors.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ jobs:
5050
ftp-username: ${{ secrets.SFTP_USER }}
5151
ftp-password: ${{ secrets.SFTP_PASSWORD }}
5252
local-dir: plugins/bifrost-framework/vendor/
53+
<<<<<<< feature/theme
5354
git-ftp-args: --all
55+
=======
56+
>>>>>>> trunk
5457
known-hosts: ${{ secrets.SFTP_KNOWN_HOSTS }}
5558

5659
- name: Install plugin dependencies (bifrost-music)
@@ -65,7 +68,6 @@ jobs:
6568
ftp-username: ${{ secrets.SFTP_USER }}
6669
ftp-password: ${{ secrets.SFTP_PASSWORD }}
6770
local-dir: plugins/bifrost-music/vendor/
68-
git-ftp-args: --all
6971
known-hosts: ${{ secrets.SFTP_KNOWN_HOSTS }}
7072

7173
# ── Theme ───────────────────────────────────────────────────────────────
@@ -82,5 +84,4 @@ jobs:
8284
ftp-username: ${{ secrets.SFTP_USER }}
8385
ftp-password: ${{ secrets.SFTP_PASSWORD }}
8486
local-dir: themes/bifrost-noise/vendor/
85-
git-ftp-args: --all
8687
known-hosts: ${{ secrets.SFTP_KNOWN_HOSTS }}

0 commit comments

Comments
 (0)