+ self reference the deps from the corresponding branches in this repo, this makes the repo self contained

+ update workflows to point at this repo when cloning deps

+ update branches paths

+ update submodules
This commit is contained in:
ota 2023-12-16 19:51:55 +02:00 committed by otavepto
parent 8fb7231a36
commit 8390e96972
8 changed files with 24 additions and 24 deletions

View File

@ -14,7 +14,7 @@ permissions:
env: env:
# Expected format {owner}/{repo}. # Expected format {owner}/{repo}.
DEPS_REPO: 'otavepto/gbe_fork-deps' DEPS_REPO: 'otavepto/gbe_fork'
THIRD_PARTY_BASE_DIR: 'third-party' THIRD_PARTY_BASE_DIR: 'third-party'
DEPS_CACHE_KEY: emu-deps-linux DEPS_CACHE_KEY: emu-deps-linux
DEPS_CACHE_DIR: build-linux-deps DEPS_CACHE_DIR: build-linux-deps
@ -42,7 +42,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: "${{env.DEPS_REPO}}" repository: "${{env.DEPS_REPO}}"
ref: 'deps/linux' ref: 'third-party/deps/linux'
path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/linux" path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/linux"
lfs: true lfs: true
@ -51,7 +51,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: "${{env.DEPS_REPO}}" repository: "${{env.DEPS_REPO}}"
ref: 'deps/common' ref: 'third-party/deps/common'
path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/common" path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/common"
lfs: true lfs: true
@ -86,7 +86,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: "${{env.DEPS_REPO}}" repository: "${{env.DEPS_REPO}}"
ref: 'build/linux' ref: 'third-party/build/linux'
path: "${{env.THIRD_PARTY_BASE_DIR}}/build/linux" path: "${{env.THIRD_PARTY_BASE_DIR}}/build/linux"
lfs: true lfs: true

View File

@ -14,7 +14,7 @@ permissions:
env: env:
# Expected format {owner}/{repo}. # Expected format {owner}/{repo}.
DEPS_REPO: 'otavepto/gbe_fork-deps' DEPS_REPO: 'otavepto/gbe_fork'
THIRD_PARTY_BASE_DIR: 'third-party' THIRD_PARTY_BASE_DIR: 'third-party'
DEPS_CACHE_KEY: emu-deps-win DEPS_CACHE_KEY: emu-deps-win
DEPS_CACHE_DIR: build-win-deps DEPS_CACHE_DIR: build-win-deps
@ -42,7 +42,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: "${{env.DEPS_REPO}}" repository: "${{env.DEPS_REPO}}"
ref: 'deps/win' ref: 'third-party/deps/win'
path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/win" path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/win"
lfs: true lfs: true
@ -51,7 +51,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: "${{env.DEPS_REPO}}" repository: "${{env.DEPS_REPO}}"
ref: 'deps/common' ref: 'third-party/deps/common'
path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/common" path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/common"
lfs: true lfs: true
@ -60,7 +60,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: "${{env.DEPS_REPO}}" repository: "${{env.DEPS_REPO}}"
ref: 'common/win' ref: 'third-party/common/win'
path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win" path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win"
lfs: true lfs: true
@ -92,7 +92,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: "${{env.DEPS_REPO}}" repository: "${{env.DEPS_REPO}}"
ref: 'common/win' ref: 'third-party/common/win'
path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win" path: "${{env.THIRD_PARTY_BASE_DIR}}/common/win"
lfs: true lfs: true

20
.gitmodules vendored
View File

@ -1,20 +1,20 @@
[submodule "third-party/build/linux"] [submodule "third-party/build/linux"]
path = third-party/build/linux path = third-party/build/linux
url = git@github.com:otavepto/gbe_fork-deps.git url=git@github.com:otavepto/gbe_fork.git
branch = build/linux branch = third-party/build/linux
[submodule "third-party/common/win"] [submodule "third-party/common/win"]
path = third-party/common/win path = third-party/common/win
url = git@github.com:otavepto/gbe_fork-deps.git url=git@github.com:otavepto/gbe_fork.git
branch = common/win branch = third-party/common/win
[submodule "third-party/deps/common"] [submodule "third-party/deps/common"]
path = third-party/deps/common path = third-party/deps/common
url = git@github.com:otavepto/gbe_fork-deps.git url=git@github.com:otavepto/gbe_fork.git
branch = deps/common branch = third-party/deps/common
[submodule "third-party/deps/linux"] [submodule "third-party/deps/linux"]
path = third-party/deps/linux path = third-party/deps/linux
url = git@github.com:otavepto/gbe_fork-deps.git url=git@github.com:otavepto/gbe_fork.git
branch = deps/linux branch = third-party/deps/linux
[submodule "third-party/deps/win"] [submodule "third-party/deps/win"]
path = third-party/deps/win path = third-party/deps/win
url = git@github.com:otavepto/gbe_fork-deps.git url=git@github.com:otavepto/gbe_fork.git
branch = deps/win branch = third-party/deps/win

@ -1 +1 @@
Subproject commit 29c508dd14df6a24a72edc305b3a10a910bba252 Subproject commit 754742c6fc3f9a34b3fe75f26f8f99da9adee300

@ -1 +1 @@
Subproject commit fcd4f58e97435739e3dc1c8e2db564c474b37b7f Subproject commit 32c8c7e7308f84dac9d94977f9297e5489a93611

@ -1 +1 @@
Subproject commit a579dfd2f050c64d3b154c35e6152b01c1913663 Subproject commit 488955b33cc330d1aa1469a94b88238c8b8c9ee1

@ -1 +1 @@
Subproject commit e13256435775941ff1251ac7e8c413f2bb14a523 Subproject commit b523ab22a1d26414f821daf8eae11ced6736ecc8

@ -1 +1 @@
Subproject commit aebf5a180358592d669e2cffcff1b14d67545777 Subproject commit 2807eea527d518f49f5d2d38ff19440467553c8f