mirror of
https://github.com/nextcloud/desktop.git
synced 2025-07-21 10:44:21 +00:00
ci: switch back to upstream CraftMaster
The fix we needed was merged this week 🎉 https://invent.kde.org/packaging/craftmaster/-/merge_requests/7 Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
This commit is contained in:

committed by
Matthieu Gallien

parent
5bd000dc66
commit
ed22111100
2
.github/workflows/macos-build-and-test.yml
vendored
2
.github/workflows/macos-build-and-test.yml
vendored
@ -48,7 +48,7 @@ jobs:
|
||||
|
||||
- name: Download Craft
|
||||
run: |
|
||||
git clone -q --depth=1 https://invent.kde.org/ggadinger/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }}
|
||||
git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }}
|
||||
|
||||
- name: Add required blueprint repositories
|
||||
run: |
|
||||
|
2
.github/workflows/windows-build-and-test.yml
vendored
2
.github/workflows/windows-build-and-test.yml
vendored
@ -24,7 +24,7 @@ jobs:
|
||||
- name: Install Craft Master with Nextcloud Client Deps
|
||||
shell: pwsh
|
||||
run: |
|
||||
& cmd /C "git clone -q --depth=1 https://invent.kde.org/ggadinger/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} 2>&1"
|
||||
& cmd /C "git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} 2>&1"
|
||||
|
||||
function craft() {
|
||||
python "${{ env.CRAFT_MASTER_LOCATION }}\CraftMaster.py" --config "${{ env.CRAFT_MASTER_CONFIG }}" --target ${{ env.CRAFT_TARGET }} -c $args
|
||||
|
@ -28,7 +28,7 @@ struct Build: ParsableCommand {
|
||||
var brewInstallShUrl = "https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh"
|
||||
|
||||
@Option(name: [.long], help: "CraftMaster Git URL.")
|
||||
var craftMasterGitUrl = "https://invent.kde.org/ggadinger/craftmaster.git"
|
||||
var craftMasterGitUrl = "https://invent.kde.org/packaging/craftmaster.git"
|
||||
|
||||
@Option(name: [.long], help: "KDE Craft blueprints Git URL.")
|
||||
var kdeBlueprintsGitUrl = "https://github.com/nextcloud/craft-blueprints-kde.git"
|
||||
|
Reference in New Issue
Block a user