Skip to content

Commit 84da87d

Browse files
committed
Use local recipies
1 parent 895a1eb commit 84da87d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/build_deps.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ jobs:
3535
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
3636
run: |
3737
conan remote disable conancenter
38-
conan remote add swift https://artifactory.swift-project.org/artifactory/api/conan/conan
38+
conan remote add swift https://artifactory.swift-project.org/artifactory/api/conan/conan-local
3939
conan remote login swift "$ARTIFACTORY_USER" --password "$ARTIFACTORY_TOKEN"
40-
conan remote add swift_upload https://artifactory.swift-project.org/artifactory/api/conan/conan-local
41-
conan remote login swift_upload "$ARTIFACTORY_USER" --password "$ARTIFACTORY_TOKEN"
4240
- name: Build libraries
4341
shell: bash
4442
run: |
@@ -48,4 +46,4 @@ jobs:
4846
if: github.ref == 'refs/heads/main'
4947
shell: bash
5048
run: |
51-
conan upload "*" -r swift_upload --confirm
49+
conan upload "*" -r swift --confirm

conanfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ def requirements(self):
1212
self.requires("libevent/2.1.12")
1313
if self.settings.os != "Linux":
1414
self.requires("dbus/1.15.8")
15+
self.requires("nlohmann_json/3.11.3")
1516

1617
def configure(self):
1718
self.options["libevent"].with_openssl = False

0 commit comments

Comments
 (0)