Skip to content

Commit

Permalink
Remove mapping from BYZ to e_byzantium (#2378) #patch
Browse files Browse the repository at this point in the history
They are different entities.
  • Loading branch information
IhateTrains authored Dec 27, 2024
1 parent 091f2cd commit b63f8f4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: "List installed dotnet SDKs"
if: matrix.os == 'Windows'
run: dotnet --list-sdks
- name: "Setup Dotnet for use with actions"
# don't run on self-hosted Windows
if: ${{ !contains(toJSON(matrix.os), 'windows') || !contains(toJSON(matrix.os), 'self-hosted') }}
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/build_dev_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ jobs:
- name: "Setup Dotnet for use with actions"
uses: actions/setup-dotnet@v4
with:
global-json-file: Fronter.NET/global.json
#global-json-file: Fronter.NET/global.json
global-json-file: global.json
- name: "Replace frontend background image"
run: |
rm Fronter.NET/Fronter.NET/Assets/Images/background.png
Expand All @@ -69,10 +70,10 @@ jobs:
BACKBLAZE_KEY_ID: ${{ secrets.BACKBLAZE_KEY_ID }}
BACKBLAZE_APPLICATION_KEY: ${{ secrets.BACKBLAZE_APPLICATION_KEY }}
BACKBLAZE_BUCKET_ID: ${{ secrets.BACKBLAZE_BUCKET_ID }}
- name: Setup Dotnet for use with actions
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
# - name: Setup Dotnet for use with actions
# uses: actions/setup-dotnet@v4
# with:
# global-json-file: global.json
- name: "Build backend"
working-directory: ImperatorToCK3
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ jobs:
fetch-depth: 0
submodules: recursive
- name: "Setup Dotnet for use with actions"
# don't run on self-hosted Windows
if: ${{ !contains(toJSON(matrix.os), 'windows') || !contains(toJSON(matrix.os), 'self-hosted') }}
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
Expand Down
1 change: 0 additions & 1 deletion ImperatorToCK3/Data_Files/configurables/title_map.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
link = { ir = CRT ck3 = k_krete rank = k }
link = { ir = KNO ck3 = k_krete rank = k }
link = { ir = EPI ck3 = k_epirus rank = k }
link = { ir = BYZ ck3 = e_byzantium rank = e }

# Asia Minor

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sdk": {
"version": "9.0.100",
"allowPrerelease": true,
"rollForward": "latestPatch"
"rollForward": "disable"
}
}

0 comments on commit b63f8f4

Please sign in to comment.