Skip to content

Commit

Permalink
Changed maintainer info and paths according to feedback on PR. Fixed …
Browse files Browse the repository at this point in the history
…warnings when running workflow file.
  • Loading branch information
larspalo committed Feb 27, 2024
1 parent 1004e3f commit 888744b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Calculate versions
id: vers
Expand All @@ -33,10 +33,10 @@ jobs:
RELEASE_FLAG=ON
fi
echo "::set-output name=project_ver::$PROJECT_VERSION"
echo "::set-output name=build_ver::$BUILD_VERSION"
echo "::set-output name=full_ver::$PROJECT_VERSION-$BUILD_VERSION"
echo "::set-output name=release_flag::$RELEASE_FLAG"
echo "project_ver=$PROJECT_VERSION" >> $GITHUB_OUTPUT
echo "build_ver=$BUILD_VERSION" >> $GITHUB_OUTPUT
echo "full_ver=$PROJECT_VERSION-$BUILD_VERSION" >> $GITHUB_OUTPUT
echo "release_flag=$RELEASE_FLAG" >> $GITHUB_OUTPUT
- name: Display versions
run: |
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
run: ${{github.workspace}}/build-scripts/for-win64/build-on-ubuntu.sh ${{needs.calc_ver.outputs.project_ver}} ${{needs.calc_ver.outputs.build_ver}}

- name: Upload result
uses: nanoufo/action-upload-artifacts-and-release-assets@v1.4
uses: nanoufo/action-upload-artifacts-and-release-assets@v2
with:
path: |
${{github.workspace}}/build/win64/*${{needs.calc_ver.outputs.full_ver}}*.deb
Expand All @@ -101,10 +101,10 @@ jobs:
run: ${{github.workspace}}/build-scripts/for-win64/build-static-on-ubuntu.sh ${{needs.calc_ver.outputs.project_ver}} ${{needs.calc_ver.outputs.build_ver}}

- name: Upload result
uses: nanoufo/action-upload-artifacts-and-release-assets@v1.4
uses: nanoufo/action-upload-artifacts-and-release-assets@v2
with:
path: |
${{github.workspace}}/build/win64/*${{needs.calc_ver.outputs.full_ver}}*.deb
${{github.workspace}}/build/win64-static/*${{needs.calc_ver.outputs.full_ver}}*.deb
upload-release-files: ${{ needs.calc_ver.outputs.release_flag }}
release-upload-url: ${{ needs.calc_ver.outputs.release_upload_url }}
if-no-files-found: error
Expand Down
12 changes: 6 additions & 6 deletions build-scripts/for-win64/build-static-on-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ DEBIAN_PKG_NAME=wxwidgets3-mingw-w64-static
VERSION=${1:-3.2.3}
BUILD_VERSION=${2:-0.go}
MINGW64_PREFIX=/usr/x86_64-w64-mingw32
PKG_DIR=`pwd`/build/win64/${DEBIAN_PKG_NAME}_${VERSION}-${BUILD_VERSION}_all
PKG_DIR=`pwd`/build/win64-static/${DEBIAN_PKG_NAME}_${VERSION}-${BUILD_VERSION}_all


mkdir -p build/win64
rm -rf build/win64/*
cp -Rv $SRC_DIR/submodules/WxWidgets build/win64/src
mkdir -p build/win64-static
rm -rf build/win64-static/*
cp -Rv $SRC_DIR/submodules/WxWidgets build/win64-static/src

pushd build/win64/src
pushd build/win64-static/src

./configure --host=x86_64-w64-mingw32 --prefix=$MINGW64_PREFIX --enable-unicode --disable-shared

Expand All @@ -34,7 +34,7 @@ cat >$PKG_DIR/DEBIAN/control <<EOF
Package: $DEBIAN_PKG_NAME
Version: $VERSION-$BUILD_VERSION
Architecture: all
Maintainer: Oleg Samarin <osamarin68@gmail.com>
Maintainer: Lars Palo <larspalo@yahoo.se>
Description: Everything needed for development with wxWidgets/wxMSW
EOF

Expand Down

0 comments on commit 888744b

Please sign in to comment.