-
Notifications
You must be signed in to change notification settings - Fork 47
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add AppImageBuilder #80
Open
lulol
wants to merge
17
commits into
ygrek:master
Choose a base branch
from
lulol:lulol-appimagebuilder
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
fd0f97c
Add AppImageBuilder
lulol 3b8c99b
Copy ocamlformat.opam
lulol 19d7934
Move AppImageBuilder.yml to the packages dir
lulol e8cc362
Move AppImageBuilder.yml to packages dir
lulol 79b9e54
Add workflow to manually build an mlnet+gui appimage
lulol 81d5f0f
Delete ocamlformat.opam
lulol 32787ea
Add ocaml ocaml-findlib and liblablgtk2-ocaml-dev
lulol c4a0308
remove pipe to true
lulol 172398f
Merge branch 'ygrek:master' into lulol-appimagebuilder
lulol 4fe024f
Update versions and add requested changes
lulol 55986c9
Update build system version, add requested changes
lulol 2a8ec5e
Add version labels to generated artifacts
lulol 85c0444
Build appimage only for x86_64
lulol 493acca
Merge branch 'ygrek:master' into lulol-appimagebuilder
lulol 75606ef
Add static hash check for downloaded appimage-builder
lulol 1e6d34e
Add HEAD commit hash to version
lulol 51702ed
Merge branch 'ygrek:master' into lulol-appimagebuilder
lulol File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add version labels to generated artifacts
Add version, arch and os labels to generated artifacts. Remove now unneeded VERSION file.
- Loading branch information
commit 2a8ec5e27a30afb615ef0b11f23c1bc1f9129bc7
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,10 @@ env: | |
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-22.04 | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
matrix: | ||
os: [ubuntu-22.04] | ||
|
||
steps: | ||
- name: Checkout code | ||
|
@@ -30,22 +33,25 @@ jobs: | |
|
||
- name: Save version file | ||
run: | | ||
./mlnet -v 2>&1 | sed -ne "1s#^.*Starting MLDonkey \([^ ]\+\) .*#\1#p" > VERSION | ||
echo "VERSION=$(cat VERSION)" | ||
VERSION=$(./mlnet -v 2>&1 | sed -ne "1s#^.*Starting MLDonkey \([^ ]\+\) .*#\1#p") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. there should be better way to get version without running the binary. Worst case can grep configure log, or actually this :
see ocaml/ocaml#13637 for why less ugly methods don't work |
||
{ | ||
echo "APP_VERSION=$VERSION" | ||
echo "HOST_TYPE=$HOSTTYPE" | ||
echo "OS_TYPE=${{matrix.os}}" | ||
} | tee -a $GITHUB_ENV | ||
|
||
- name: Upload mlnet and mlgui binaries | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: mlnet and mlgui | ||
name: mlnet-and-mlgui-${{env.APP_VERSION}}-${{env.HOST_TYPE}}-${{env.OS_TYPE}} | ||
path: | | ||
mlnet | ||
mlgui | ||
VERSION | ||
|
||
- name: Upload utils | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: Utils | ||
name: mldonkey-utils-${{env.APP_VERSION}}-${{env.HOST_TYPE}}-${{env.OS_TYPE}} | ||
path: | | ||
bt_dht_node | ||
copysources | ||
|
@@ -54,19 +60,22 @@ jobs: | |
mld_hash | ||
subconv | ||
svg_converter | ||
VERSION | ||
if-no-files-found: warn | ||
|
||
- name: Upload mlnet+gui binary | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: mlnet+gui | ||
path: | | ||
mlnet+gui | ||
VERSION | ||
name: mlnet+gui-${{env.APP_VERSION}}-${{env.HOST_TYPE}}-${{env.OS_TYPE}} | ||
path: mlnet+gui | ||
if-no-files-found: warn | ||
|
||
outputs: | ||
APP_VERSION: ${{env.APP_VERSION}} | ||
HOST_TYPE: ${{env.HOST_TYPE}} | ||
OS_TYPE: ${{env.OS_TYPE}} | ||
|
||
appimage: | ||
if: ${{ needs.build.outputs.OS_TYPE == 'ubuntu-22.04' }} | ||
needs: build | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
|
@@ -76,7 +85,7 @@ jobs: | |
- name: Download mlnet+gui binary | ||
uses: actions/download-artifact@v4 | ||
with: | ||
name: mlnet+gui | ||
name: mlnet+gui-${{needs.build.outputs.APP_VERSION}}-${{needs.build.outputs.HOST_TYPE}}-${{needs.build.outputs.OS_TYPE}} | ||
|
||
- name: Install dependencies | ||
run: sudo apt-get install -y --no-install-recommends libfuse2 | ||
|
@@ -93,7 +102,7 @@ jobs: | |
- name: Build AppImage | ||
run: | | ||
# Get application version | ||
APP_VERSION="$(cat VERSION)" | ||
APP_VERSION="${{needs.build.outputs.APP_VERSION}}" | ||
echo "APP_VERSION=$APP_VERSION" | ||
export APP_VERSION | ||
# Download appimage-builder | ||
|
@@ -111,6 +120,6 @@ jobs: | |
- name: Upload AppImage | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: mldonkey_AppImage | ||
name: mldonkey-${{needs.build.outputs.APP_VERSION}}-${{needs.build.outputs.HOST_TYPE}}.AppImage | ||
path: mldonkey-*.AppImage | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think ideally this build part of pipeline should be move to main pipeline, and then here keep only appimage (and use artifacts produced by main build pipeline)