Skip to content

Commit ab5b4ce

Browse files
committed
ci-build: try to use hombrew .rb file to install older dosbox-x version
1 parent 69c5579 commit ab5b4ce

3 files changed

Lines changed: 24 additions & 13 deletions

File tree

.github/actions/build/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ runs:
6767
OWBUILD_STAGE: 'build'
6868
OWTOOLS: ${{inputs.owtools}}
6969
OWROOT: ${{github.workspace}}
70-
#OWDOSBOX: 'dosbox-x'
71-
OWDOSBOX: 'dosbox'
70+
OWDOSBOX: 'dosbox-x'
7271
OWVERBOSE: 1
7372
shell: bash
7473
- uses: ./.github/actions/artfsave

.github/actions/dosboxin/action.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,20 @@ runs:
1616
done
1717
shell: bash
1818
- if: runner.os == 'macOS'
19-
name: Install DOSBOX-X/DOSBOX
19+
name: Setup curl options
20+
id: curlcmd
21+
uses: ./.github/actions/curlcmd
22+
- if: runner.os == 'macOS'
23+
name: "Download Coverity Tools"
24+
run: |
25+
$response = ${{steps.curlcmd.outputs.cov}} `
26+
"https://github.com/Homebrew/homebrew-core/blob/2e4fee868ba6e91e18a0ae0e89999437de84eb8c/Formula/d/dosbox-x.rb"
27+
if( '${{env.OWDEBUG}}' -eq '1' ) { $response }
28+
shell: pwsh
29+
- if: runner.os == 'macOS'
30+
name: Install DOSBOX-X
2031
run: |
21-
brew install dosbox-x
22-
brew install --cask dosbox
32+
#brew install dosbox-x
33+
brew install --build-from-source dosbox-x.rb
34+
rm -f dosbox-x.rb
2335
shell: bash

.github/workflows/cibuild.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ jobs:
128128
args: 'clang'
129129
gitpath: 'rel bino64'
130130
# OSX ARM64
131-
#- name: 'OSX arm64'
132-
# suffix: 'osx a64'
133-
# docbuild: ''
134-
# run_tests: ''
135-
# image: 'macos-15'
136-
# owtools: 'CLANG'
137-
# args: 'clang'
138-
# gitpath: 'rel armo64'
131+
- name: 'OSX arm64'
132+
suffix: 'osx a64'
133+
docbuild: ''
134+
run_tests: ''
135+
image: 'macos-15'
136+
owtools: 'CLANG'
137+
args: 'clang'
138+
gitpath: 'rel armo64'
139139
name: ${{matrix.name}} ${{matrix.args}}
140140
uses: ./.github/workflows/buildx.yml
141141
with:

0 commit comments

Comments
 (0)