Automated build #855
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| #!/usr/bin/python3 | ||
|
|
||
| import sys | ||
|
|
||
| print('Number of arguments:', len(sys.argv), 'arguments.') | ||
| print('Argument List:', str(sys.argv)) | ||
|
|
||
| fullref=sys.argv[1] | ||
| pushed_name=sys.argv[2] | ||
| jamulus_version=sys.argv[3] | ||
| release_version_name = jamulus_version | ||
|
|
||
| if fullref.startswith("refs/tags/"): | ||
| print('python is Tag') | ||
|
Contributor
Author
There was a problem hiding this comment. yes, changed to a more meaningful text |
||
| is_prerelease=False | ||
| if pushed_name == "latest": | ||
| release_version_name = "latest" | ||
| release_title='Release "latest"' | ||
| else: | ||
| release_version_name = jamulus_version | ||
| release_title="Release {} ({})".format(release_version_name, pushed_name) | ||
| elif fullref.startswith("refs/heads/"): | ||
| print('python is Head') | ||
| is_prerelease=True | ||
| release_title='Pre-Release of "{}"'.format(pushed_name) | ||
| else: | ||
| print('unknown git-reference type') | ||
| release_title='Pre-Release of "{}"'.format(pushed_name) | ||
| is_prerelease=True | ||
|
|
||
| print("IS_PRERELEASE::{}".format(is_prerelease)) #debug output | ||
| print("RELEASE_TITLE::{}".format(release_title)) #debug output | ||
| print("::set-output name=IS_PRERELEASE::{}".format(str(is_prerelease).lower())) | ||
| print("::set-output name=RELEASE_TITLE::{}".format(release_title)) | ||
| print("::set-output name=RELEASE_TAG::{}".format("releasetag/"+pushed_name)) | ||
| print("::set-output name=PUSHED_NAME::{}".format(pushed_name)) | ||
| print("::set-output name=JAMULUS_VERSION::{}".format(jamulus_version)) | ||
| print("::set-output name=RELEASE_VERSION_NAME::{}".format(release_version_name)) | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,7 +1,14 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| # get version from project-file | ||
| JAMULUS_VERSION=$(cat ${1}/Jamulus.pro | grep -oP 'VERSION = \K\w[^\s\\]*') | ||
|
|
||
| # get the tag/branch-name which pushed this | ||
| PUSHED_NAME=${GITHUB_REF#refs/*/} | ||
|
|
||
| # calculate various variables | ||
| python3 ${1}/.github/actions_scripts/analyse_git_reference.py ${GITHUB_REF} ${PUSHED_NAME} ${JAMULUS_VERSION} | ||
|
Member
There was a problem hiding this comment. Would it be possible to also get the Jamulus version and Tag via python? this would be much cleaner.
Contributor
Author
There was a problem hiding this comment. possible, but more part of #854 optimizations. |
||
|
|
||
| perl ${1}/.github/actions_scripts/getChangelog.pl ${1}/ChangeLog ${VERSION} > ${1}/autoLatestChangelog.md | ||
|
Member
There was a problem hiding this comment. You will have to rename ${VERSION} to ${JAMULUS_VERSION} if you also renamed the variable above. Also Codacy complained about missing quotes. We might need to add them around the variables/file paths.
Contributor
Author
There was a problem hiding this comment. thanks.
Member
There was a problem hiding this comment. You will not see them. I setup codacy on my repo only. You can just enable it if you create a codacy account (just google for it).
Contributor
Author
There was a problem hiding this comment. Sorry guys, I accidentally used the PR branch for development. I will open a new request soon. |
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -3,123 +3,132 @@ | |
| on: | ||
| push: | ||
| tags: | ||
|
Member
There was a problem hiding this comment. Not sure if we should allow workflow_dispatch (for me it didn't always work) |
||
| - "r*" | ||
| - latest | ||
| branches: | ||
| - "*" | ||
| # - master # could be restricted to master, if all branches take too much build time | ||
| name: Publish Release | ||
| jobs: | ||
|
Member
There was a problem hiding this comment. You've changed a lot and I still have to look through it. But it seems to work. Would it be possible that you add the same comments as I did?
Contributor
Author
There was a problem hiding this comment. at lease I did my best, feel free to adjust them to your needs |
||
| create_release: | ||
| name: Create release | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| upload_url: ${{ steps.create_release_step.outputs.upload_url }} | ||
| version: ${{ steps.jamulus-build-vars.outputs.JAMULUS_VERSION }} | ||
| version_name: ${{ steps.jamulus-build-vars.outputs.RELEASE_VERSION_NAME }} | ||
|
|
||
| steps: | ||
| # Checkout code | ||
| - name: Checkout code | ||
| uses: actions/checkout@v2 | ||
|
|
||
| # Set variables | ||
| # Determine releas / pre-release | ||
| - name: Get Jamulus build info | ||
| run: sh ${{ github.workspace }}/.github/actions_scripts/get_release_vars.sh ${{ github.workspace }} | ||
| id: jamulus-build-vars | ||
|
|
||
| # remove tag "latest" from that release | ||
| - name: Remove release, if existing (for latest and branches) | ||
| continue-on-error: true | ||
| uses: dev-drprasad/delete-tag-and-release@v0.1.2 | ||
| with: | ||
| delete_release: false | ||
| tag_name: ${{ steps.jamulus-build-vars.outputs.RELEASE_TAG }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| # create release (empty, filled by next job) | ||
| - name: 'Create Release ${{steps.jamulus-build-vars.outputs.RELEASE_TAG}} {{steps.jamulus-build-vars.outputs.RELEASE_TITLE}}' | ||
| id: create_release_step | ||
| uses: actions/create-release@v1 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| tag_name: ${{ steps.jamulus-build-vars.outputs.RELEASE_TAG }} | ||
| release_name: ${{ steps.jamulus-build-vars.outputs.RELEASE_TITLE }} | ||
| body_path: ${{ github.workspace }}/autoLatestChangelog.md | ||
| prerelease: ${{ steps.jamulus-build-vars.outputs.IS_PRERELEASE }} | ||
| draft: false | ||
|
|
||
|
|
||
| ### CANCEL ### can be used for development concerning release-creation | ||
| #- name: Cancelthrougherroe | ||
| # run: myundefinedfunction | ||
|
|
||
|
|
||
| release_assets: | ||
| name: Release assets for ${{ matrix.config.config_name }} | ||
|
Member
There was a problem hiding this comment. @nefarius2001 can you check if this works? One of the GH Actions steps didn't fill the variable correctly for me. |
||
| needs: create_release | ||
| runs-on: ${{ matrix.config.building_on_os }} | ||
| strategy: | ||
| matrix: # Think of this like a foreach loop. Basically runs the steps with every combination of the contents of this. More info: https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix | ||
| config: | ||
| - config_name: Linux (normal) | ||
|
Member
There was a problem hiding this comment. That's much cleaner to do it this way.
Member
There was a problem hiding this comment. Would it be possible to fill the run: entry here already? This would allow us to remove the different "Build" steps for each OS |
||
| target_os: linux | ||
| building_on_os: ubuntu-18.04 | ||
| asset_path: deploy/Jamulus_amd64.deb | ||
| asset_name: jamulus_${{ needs.create_release.outputs.version_name }}_ubuntu_amd64.deb | ||
| - config_name: Linux (headless) | ||
| target_os: linux | ||
| building_on_os: ubuntu-18.04 | ||
| asset_path: deploy/Jamulus_headless_amd64.deb | ||
| asset_name: jamulus_headless_${{ needs.create_release.outputs.version_name }}_ubuntu_amd64.deb | ||
| - config_name: MacOS | ||
| target_os: macos | ||
| building_on_os: macos-10.15 | ||
| asset_path: deploy/Jamulus-installer-mac.dmg | ||
| asset_name: jamulus_${{ needs.create_release.outputs.version_name }}_mac.dmg | ||
| #- config_name: Windows | ||
| # target_os: windows | ||
| # building_on_os: windows-latest | ||
| # asset_path: ${{ github.workspace }}\deploy\Jamulus-installer-win.exe | ||
| # asset_latest_name: jamulus_latest_win.exe | ||
| # asset_name: jamulus_${{ needs.create_release.outputs.version_name }}_win.exe | ||
| - config_name: AndroidAPK | ||
| target_os: android | ||
| building_on_os: ubuntu-18.04 | ||
| asset_path: android-build/build/outputs/apk/debug/android-build-debug.apk | ||
| asset_name: jamulus_${{ needs.create_release.outputs.version_name }}_android.apk | ||
| steps: | ||
| # Checkout code | ||
| - name: Checkout code | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| submodules: true | ||
|
|
||
| # Install QT for windows (part of scripts in other os) | ||
| - name: Install Qt (64 Bit) | ||
| uses: jurplel/install-qt-action@v2 | ||
| if: matrix.config.building_on_os == 'windows-latest' | ||
| with: | ||
| version: '5.15.2' | ||
| dir: '${{ github.workspace }}' | ||
| arch: 'win64_msvc2019_64' | ||
| - name: Install Qt (32 Bit) | ||
| uses: jurplel/install-qt-action@v2 | ||
| if: matrix.config.building_on_os == 'windows-latest' | ||
| with: | ||
| version: '5.15.2' | ||
| dir: '${{ github.workspace }}' | ||
| arch: 'win32_msvc2019' | ||
|
|
||
| # Build | ||
| - name: "Build deb (Linux)" | ||
| run: sh linux/autorelease_linux.sh ${{ github.workspace }} | ||
| if: matrix.config.target_os == 'linux' | ||
| - name: "Build (Windows)" | ||
|
Member
There was a problem hiding this comment. Should be removed and synced to my changes.
Contributor
Author
There was a problem hiding this comment. how? please make a suggestion
Member
There was a problem hiding this comment. If you've removed the Install Qt steps (I think this is now the case) and run my script autobuild_windows.ps1 this is solved. I think this PR is no longer up to date. |
||
| run: powershell .\windows\deploy_windows.ps1 ${{ github.workspace }}\Qt\5.15.2\; cp deploy\Jamulus*installer-win.exe deploy\Jamulus-installer-win.exe | ||
| if: matrix.config.target_os == 'windows' | ||
| - name: "Build (macOS)" | ||
| run: sh mac/autorelease_mac.sh ${{ github.workspace }} | ||
| if: matrix.config.target_os == 'macos' | ||
| - name: "Build (Android)" | ||
| uses: ./distribute_android/ # Uses an action in the directory | ||
| if: matrix.config.target_os == 'android' | ||
|
|
||
| # Upload tag | ||
| - name: Upload Release Asset - Tag | ||
| id: upload-release-asset | ||
| uses: actions/upload-release-asset@v1 | ||
| env: | ||
|
|
@@ -130,38 +139,3 @@ jobs: | |
| asset_name: ${{ matrix.config.asset_name }} | ||
| asset_content_type: application/octet-stream | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| FROM ubuntu:18.04 | ||
|
Member
There was a problem hiding this comment. Can't say much from here on (I don't know android building and docker) |
||
|
|
||
| #based on https://gitlab.com/vikingsoftware/qt5.12.4androiddocker | ||
| #LABEL "Maintainer"="Guenter Schwann" | ||
| #LABEL "version"="0.3" | ||
|
|
||
| ENV DEBIAN_FRONTEND=noninteractive | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y build-essential git zip unzip bzip2 p7zip-full wget curl chrpath libxkbcommon-x11-0 && \ | ||
| # Dependencies to create Android pkg | ||
| apt-get install -y openjdk-8-jre openjdk-8-jdk openjdk-8-jdk-headless gradle && \ | ||
| # Clean apt cache | ||
| apt-get clean && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # Add Android tools and platform tools to PATH | ||
| ENV ANDROID_HOME /opt/android/android-sdk | ||
| ENV ANDROID_SDK_ROOT /opt/android/android-sdk | ||
| ENV ANDROID_NDK_ROOT /opt/android/android-ndk | ||
|
|
||
| # paths for Android SDK | ||
| RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/latest/ | ||
| RUN mkdir -p ${ANDROID_SDK_ROOT}/build-tools/latest/ | ||
|
|
||
| # Install Android sdk | ||
| #https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip | ||
| #https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip | ||
| RUN downloadfile="downloadfile" && \ | ||
| wget -q -O downloadfile https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip && \ | ||
| unzip -q downloadfile && \ | ||
| rm downloadfile && \ | ||
| mv cmdline-tools/* /opt/android/android-sdk/cmdline-tools/latest/ && \ | ||
| rm -r cmdline-tools | ||
|
|
||
| # Install Android ndk | ||
| #https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip | ||
| #https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip | ||
| RUN downloadfile="downloadfile" && \ | ||
| wget -q -O downloadfile https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip && \ | ||
| unzip -q downloadfile && \ | ||
| rm downloadfile && \ | ||
| mv android-ndk-r21d /opt/android/android-ndk | ||
|
|
||
| # Add Android tools and platform tools to PATH | ||
| ENV ANDROID_HOME /opt/android/android-sdk | ||
| ENV ANDROID_SDK_ROOT /opt/android/android-sdk | ||
| ENV ANDROID_NDK_ROOT /opt/android/android-ndk | ||
| ENV PATH $PATH:$ANDROID_HOME/tools | ||
| ENV PATH $PATH:$ANDROID_HOME/platform-tools | ||
| ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/ | ||
|
|
||
| ENV ANDROID_NDK_HOST linux-x86_64 | ||
|
|
||
| ENV ANDROID_SDKMANAGER $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager | ||
|
|
||
| # Install Android SDK | ||
| RUN yes | $ANDROID_SDKMANAGER --licenses && $ANDROID_SDKMANAGER --update | ||
| RUN $ANDROID_SDKMANAGER "platforms;android-17" | ||
| RUN $ANDROID_SDKMANAGER "platforms;android-28" | ||
| RUN $ANDROID_SDKMANAGER "platforms;android-30" | ||
| RUN $ANDROID_SDKMANAGER "build-tools;28.0.3" | ||
| RUN $ANDROID_SDKMANAGER "build-tools;30.0.2" | ||
|
|
||
|
|
||
| #5.15.2 | ||
| ENV MY_QT_VERSION 5.15.2 | ||
|
|
||
| # Download / install Qt | ||
| ####ADD https://code.qt.io/cgit/qbs/qbs.git/plain/scripts/install-qt.sh ./ | ||
| COPY install-qt.sh /install-qt.sh | ||
|
Member
There was a problem hiding this comment. Install-qt.sh that's interesting.
Collaborator
There was a problem hiding this comment. Mmmm. We do need to sort this out so we've a build script (that just gets the pre-reqs and does the qmake-make) per platform so it's re-usable - then the packaging and code analysis can both use it as they see fit.
Contributor
Author
There was a problem hiding this comment. that is likely possible. |
||
| RUN bash install-qt.sh --version $MY_QT_VERSION --target android --toolchain android qtbase qt3d qtdeclarative qtandroidextras qtconnectivity qtgamepad qtlocation qtmultimedia qtquickcontrols2 qtremoteobjects qtscxml qtsensors qtserialport qtsvg qtimageformats qttools qtspeech qtwebchannel qtwebsockets qtwebview qtxmlpatterns qttranslations | ||
|
|
||
| # Set the QTDIR environment variable | ||
| ENV QTDIR="/opt/Qt/$MY_QT_VERSION/android" | ||
|
|
||
|
|
||
| COPY build.sh /build.sh | ||
| RUN chmod +x /build.sh | ||
|
|
||
| ENTRYPOINT /bin/bash /build.sh | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
Python. Interesting. So you get some information from the current build/tag which triggered this?
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.
yes.
Easier string manipulations like startsWith.