Skip to content

Commit cfc3e6e

Browse files
committed
fix build
1 parent 29f7b08 commit cfc3e6e

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
uses: myci-actions/checkout@main
5656
- name: set PACKAGE_VERSION
5757
uses: myci-actions/export-env-var@main
58-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
58+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
5959
- name: prepare debian package
6060
run: myci-deb-prepare.sh --soname $(cat soname.txt)
6161
- name: install deps
@@ -97,7 +97,7 @@ jobs:
9797
# uses: myci-actions/checkout@main
9898
# - name: set PACKAGE_VERSION
9999
# uses: myci-actions/export-env-var@main
100-
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
100+
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
101101
# # makepkg needs to install dependency packages, so nobody user needs sudo rights
102102
# - name: add nobody to sudoers
103103
# run: |
@@ -178,7 +178,7 @@ jobs:
178178
uses: myci-actions/checkout@main
179179
- name: set PACKAGE_VERSION
180180
uses: myci-actions/export-env-var@main
181-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
181+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
182182
- name: add cocoapods repo
183183
run: pod repo add --silent cppfw https://$MYCI_GIT_USERNAME@github.com/cppfw/cocoapods-repo.git
184184
- name: install deps
@@ -217,7 +217,7 @@ jobs:
217217
install: myci
218218
- name: set PACKAGE_VERSION
219219
uses: myci-actions/export-env-var@main
220-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
220+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
221221
- name: build
222222
run: |
223223
cd build/android
@@ -436,7 +436,7 @@ jobs:
436436
uses: myci-actions/checkout@main
437437
- name: set PACKAGE_VERSION
438438
uses: myci-actions/export-env-var@main
439-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
439+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
440440
if: startsWith(github.ref, 'refs/tags/')
441441
- name: build
442442
run: |
@@ -485,7 +485,7 @@ jobs:
485485
run: make --version
486486
- name: set PACKAGE_VERSION
487487
uses: myci-actions/export-env-var@main
488-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
488+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
489489
if: startsWith(github.ref, 'refs/tags/')
490490
- name: build
491491
run: |
@@ -530,7 +530,7 @@ jobs:
530530
submodules: false
531531
- name: set PACKAGE_VERSION
532532
uses: myci-actions/export-env-var@main
533-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
533+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
534534
if: startsWith(github.ref, 'refs/tags/')
535535
- name: build
536536
run: |

nuget/build_nuget.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $scriptdir = Split-Path $MyInvocation.MyCommand.Path
33
cd $scriptdir
44

55
#extract version from debian/changelog
6-
$ver = (Get-Content ..\debian\changelog -Head 1) -replace ".*\((\d*\.\d*\.\d*)(\-\d+){0,1}\).*",'$1'
6+
$ver = (Get-Content ..\build\debian\changelog -Head 1) -replace ".*\((\d*\.\d*\.\d*)(\-\d+){0,1}\).*",'$1'
77
#Write-Host $ver
88

99
#insert version into all *.in files

pkg-config/makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
include prorab.mk
22
include prorab-pkg-config.mk
33

4+
this_version := $(shell myci-deb-version.sh)
5+
46
$(eval $(prorab-pkg-config))

0 commit comments

Comments
 (0)