Skip to content

Commit

Permalink
automation: make build-release.yaml OD version independent (#1553)
Browse files Browse the repository at this point in the history
also make it run on ubuntu-latest
  • Loading branch information
cgay authored Feb 7, 2024
2 parents 5d92aca + 451c099 commit 6e308d8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,14 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# TODO: ubuntu-latest
os: [macos-latest]
os: [ubuntu-latest, macos-latest]
steps:
- uses: actions/checkout@v4
with:
submodules: recursive

- name: Install Dependencies
run: |
# if [ "$RUNNER_OS" == "Linux" ]; then
# sudo apt-get install libgc-dev
# fi
if [ "$RUNNER_OS" == "macOS" ]; then
brew install autoconf automake ninja
fi
Expand All @@ -43,8 +39,7 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: release-tarball
# TODO: appropriate path based on architecture and release
path: release/opendylan-2023.1-x86_64-darwin.tar.bz2
path: release/opendylan.tar.bz2
compression-level: 0
retention-days: 3
overwrite: true
Expand Down
4 changes: 3 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,9 @@ dist: 3-stage-bootstrap
cp $(srcdir)/License.txt release/opendylan-$(version)/
cp $(srcdir)/README.md release/opendylan-$(version)/
cp $(srcdir)/BUILDING.rst release/opendylan-$(version)/
cd release && tar cjf opendylan-$(version)-$(TARGET_PLATFORM).tar.bz2 opendylan-$(version)
cd release \
&& tar cjf opendylan-$(version)-$(TARGET_PLATFORM).tar.bz2 opendylan-$(version) \
&& ln -s opendylan.tar.bz2 opendylan-$(version)-$(TARGET_PLATFORM).tar.bz2


TEST_LIBS = \
Expand Down

0 comments on commit 6e308d8

Please sign in to comment.