From cb03f6967d4946e5870032d8c2b382320b3757ce Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 03:11:05 +0200 Subject: [PATCH 01/42] Create release.yml --- .github/release.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 00000000000..47f24e11ff5 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,30 @@ +# This is a basic workflow that is manually triggered + +name: Manual workflow + +# Controls when the action will run. Workflow runs when manually triggered using the UI +# or API. +on: + workflow_dispatch: + # Inputs the workflow accepts. + inputs: + name: + # Friendly description to be shown in the UI instead of 'name' + description: 'Person to greet' + # Default value if no value is explicitly provided + default: 'World' + # Input has to be provided for the workflow to run + required: true + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "greet" + greet: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Runs a single command using the runners shell + - name: Send greeting + run: echo "Hello ${{ github.event.inputs.name }}" From 6209c2920a3c241852bd3384b089c68f00dc6130 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 03:12:06 +0200 Subject: [PATCH 02/42] Create ci.yml --- .github/workflows/ci.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000000..deb58f58d6b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,36 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events but only for the 5.15.2 branch + push: + branches: [ 5.15.2 ] + pull_request: + branches: [ 5.15.2 ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs a single command using the runners shell + - name: Run a one-line script + run: echo Hello, world! + + # Runs a set of commands using the runners shell + - name: Run a multi-line script + run: | + echo Add other actions to build, + echo test, and deploy your project. From bce895de759102dfde98ad3f3687e359095a8248 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 03:14:53 +0200 Subject: [PATCH 03/42] Create release.yml --- .github/workflows/release.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000000..a52ac574a90 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,31 @@ + +# This is a basic workflow that is manually triggered + +name: Manual workflow + +# Controls when the action will run. Workflow runs when manually triggered using the UI +# or API. +on: + workflow_dispatch: + # Inputs the workflow accepts. + inputs: + name: + # Friendly description to be shown in the UI instead of 'name' + description: 'Person to greet' + # Default value if no value is explicitly provided + default: 'World' + # Input has to be provided for the workflow to run + required: true + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "greet" + greet: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Runs a single command using the runners shell + - name: Send greeting + run: echo "Hello ${{ github.event.inputs.name }}" From 44193d48f44a9d2654a6016feec429f3d48a80ab Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 03:15:41 +0200 Subject: [PATCH 04/42] Delete release.yml --- .github/release.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml deleted file mode 100644 index 47f24e11ff5..00000000000 --- a/.github/release.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This is a basic workflow that is manually triggered - -name: Manual workflow - -# Controls when the action will run. Workflow runs when manually triggered using the UI -# or API. -on: - workflow_dispatch: - # Inputs the workflow accepts. - inputs: - name: - # Friendly description to be shown in the UI instead of 'name' - description: 'Person to greet' - # Default value if no value is explicitly provided - default: 'World' - # Input has to be provided for the workflow to run - required: true - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "greet" - greet: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Runs a single command using the runners shell - - name: Send greeting - run: echo "Hello ${{ github.event.inputs.name }}" From a7aff2e0ede60f48547ee55ca491d96b0461bced Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 03:22:09 +0200 Subject: [PATCH 05/42] Update submodules --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index deb58f58d6b..8b6c59a2c4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,8 +26,8 @@ jobs: - uses: actions/checkout@v2 # Runs a single command using the runners shell - - name: Run a one-line script - run: echo Hello, world! + - name: Update submodules + run: git submodule update --init --recursive # Runs a set of commands using the runners shell - name: Run a multi-line script From 40dee7ab76942fc7ddd3dbe7e245748340d350de Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 03:31:18 +0200 Subject: [PATCH 06/42] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 07659ad4bcd..c990951e9b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "qtbase"] path = qtbase - url = ../qtbase.git + url = https://github.com/qt/qtbase.git branch = 5.15.2 status = essential [submodule "qtsvg"] From 83e71f500023e601429452f7558b51e1f0c64d7e Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 03:38:50 +0200 Subject: [PATCH 07/42] Fix the submodules We are only overriding qtwebengine --- .gitmodules | 94 ++++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/.gitmodules b/.gitmodules index c990951e9b0..b7b2890c79b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,54 +6,54 @@ [submodule "qtsvg"] depends = qtbase path = qtsvg - url = ../qtsvg.git + url = https://github.com/qt/qtsvg.git branch = 5.15.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative - url = ../qtdeclarative.git + url = https://github.com/qt/qtdeclarative.git branch = 5.15.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt - url = ../qtactiveqt.git + url = https://github.com/qt/qtactiveqt.git branch = 5.15.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript - url = ../qtscript.git + url = https://github.com/qt/qtscript.git branch = 5.15.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia - url = ../qtmultimedia.git + url = https://github.com/qt/qtmultimedia.git branch = 5.15.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools - url = ../qttools.git + url = https://github.com/qt/qttools.git branch = 5.15.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns - url = ../qtxmlpatterns.git + url = https://github.com/qt/qtxmlpatterns.git branch = 5.15.2 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations - url = ../qttranslations.git + url = https://github.com/qt/qttranslations.git branch = 5.15.2 status = essential priority = 30 @@ -61,20 +61,20 @@ depends = qtdeclarative qttools recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc - url = ../qtdoc.git + url = https://github.com/qt/qtdoc.git branch = 5.15.2 status = essential priority = 40 [submodule "qtrepotools"] path = qtrepotools - url = ../qtrepotools.git + url = https://github.com/qt/qtrepotools.git branch = master status = essential project = - [submodule "qtqa"] depends = qtbase path = qtqa - url = ../qtqa.git + url = https://github.com/qt/qtqa.git branch = master status = essential priority = 50 @@ -82,132 +82,132 @@ depends = qtbase recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation - url = ../qtlocation.git + url = https://github.com/qt/qtlocation.git branch = 5.15.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors - url = ../qtsensors.git + url = https://github.com/qt/qtsensors.git branch = 5.15.2 status = addon [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative path = qtsystems - url = ../qtsystems.git + url = https://github.com/qt/qtsystems.git branch = dev status = ignore [submodule "qtfeedback"] depends = qtdeclarative recommends = qtmultimedia path = qtfeedback - url = ../qtfeedback.git + url = https://github.com/qt/qtfeedback.git branch = master status = ignore [submodule "qtdocgallery"] depends = qtdeclarative path = qtdocgallery - url = ../qtdocgallery.git + url = https://github.com/qt/qtdocgallery.git branch = master status = ignore [submodule "qtpim"] depends = qtdeclarative path = qtpim - url = ../qtpim.git + url = https://github.com/qt/qtpim.git branch = dev status = ignore [submodule "qtconnectivity"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtconnectivity - url = ../qtconnectivity.git + url = https://github.com/qt/qtconnectivity.git branch = 5.15.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland - url = ../qtwayland.git + url = https://github.com/qt/qtwayland.git branch = 5.15.2 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d - url = ../qt3d.git + url = https://github.com/qt/qt3d.git branch = 5.15.2 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats - url = ../qtimageformats.git + url = https://github.com/qt/qtimageformats.git branch = 5.15.2 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects - url = ../qtgraphicaleffects.git + url = https://github.com/qt/qtgraphicaleffects.git branch = 5.15.2 status = essential [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols - url = ../qtquickcontrols.git + url = https://github.com/qt/qtquickcontrols.git branch = 5.15.2 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus - url = ../qtserialbus.git + url = https://github.com/qt/qtserialbus.git branch = 5.15.2 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport - url = ../qtserialport.git + url = https://github.com/qt/qtserialport.git branch = 5.15.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras - url = ../qtx11extras.git + url = https://github.com/qt/qtx11extras.git branch = 5.15.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras - url = ../qtmacextras.git + url = https://github.com/qt/qtmacextras.git branch = 5.15.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras - url = ../qtwinextras.git + url = https://github.com/qt/qtwinextras.git branch = 5.15.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras - url = ../qtandroidextras.git + url = https://github.com/qt/qtandroidextras.git branch = 5.15.2 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets - url = ../qtwebsockets.git + url = https://github.com/qt/qtwebsockets.git branch = 5.15.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel - url = ../qtwebchannel.git + url = https://github.com/qt/qtwebchannel.git branch = 5.15.2 status = addon [submodule "qtwebengine"] @@ -221,106 +221,106 @@ [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d - url = ../qtcanvas3d.git + url = https://github.com/qt/qtcanvas3d.git branch = dev status = ignore [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview - url = ../qtwebview.git + url = https://github.com/qt/qtwebview.git branch = 5.15.2 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 - url = ../qtquickcontrols2.git + url = https://github.com/qt/qtquickcontrols2.git branch = 5.15.2 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing - url = ../qtpurchasing.git + url = https://github.com/qt/qtpurchasing.git branch = 5.15.2 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts - url = ../qtcharts.git + url = https://github.com/qt/qtcharts.git branch = 5.15.2 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d - url = ../qtdatavis3d.git + url = https://github.com/qt/qtdatavis3d.git branch = 5.15.2 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard - url = ../qtvirtualkeyboard.git + url = https://github.com/qt/qtvirtualkeyboard.git branch = 5.15.2 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad - url = ../qtgamepad.git + url = https://github.com/qt/qtgamepad.git branch = 5.15.2 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml - url = ../qtscxml.git + url = https://github.com/qt/qtscxml.git branch = 5.15.2 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech - url = ../qtspeech.git + url = https://github.com/qt/qtspeech.git branch = 5.15.2 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth - url = ../qtnetworkauth.git + url = https://github.com/qt/qtnetworkauth.git branch = 5.15.2 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects - url = ../qtremoteobjects.git + url = https://github.com/qt/qtremoteobjects.git branch = 5.15.2 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin - url = ../qtwebglplugin.git + url = https://github.com/qt/qtwebglplugin.git branch = 5.15.2 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie - url = ../qtlottie.git + url = https://github.com/qt/qtlottie.git branch = 5.15.2 status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline - url = ../qtquicktimeline + url = https://github.com/qt/qtquicktimeline branch = 5.15.2 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d - url = ../qtquick3d.git + url = https://github.com/qt/qtquick3d.git branch = 5.15.2 status = addon From 6624cdfd9c2468bfbd53c5b5c593bc3e0932ff7c Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 03:55:14 +0200 Subject: [PATCH 08/42] Clean up --- .github/workflows/ci.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b6c59a2c4d..fd9e0c4801f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,36 +1,21 @@ -# This is a basic workflow to help you get started with Actions name: CI -# Controls when the action will run. on: - # Triggers the workflow on push or pull request events but only for the 5.15.2 branch push: branches: [ 5.15.2 ] pull_request: branches: [ 5.15.2 ] - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" build: - # The type of runner that the job will run on runs-on: ubuntu-latest - # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - # Runs a single command using the runners shell - name: Update submodules run: git submodule update --init --recursive - - # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: | - echo Add other actions to build, - echo test, and deploy your project. From f03e06c50531926c7665eddeca1b4f5a54ee0e52 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 04:03:33 +0200 Subject: [PATCH 09/42] Update README --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index dd4af0d545a..b7673176fe0 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +[![CI](https://github.com/turtlebrowser/qt5/actions/workflows/ci.yml/badge.svg)](https://github.com/turtlebrowser/qt5/actions/workflows/ci.yml) + HOW TO BUILD QT5 ================ From bd08316159bad8c0d77e383fd9e7878665f4f5b6 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 04:04:10 +0200 Subject: [PATCH 10/42] Rename README to README.md --- README => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README => README.md (100%) diff --git a/README b/README.md similarity index 100% rename from README rename to README.md From 2292f6185e743c12cfc404205b3f79c552ca8b49 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 04:24:26 +0200 Subject: [PATCH 11/42] Create build.yml --- .github/workflows/build.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000000..226f442fdc3 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,15 @@ +name: Build Qt + +on: + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Update submodules + run: git submodule update --init --recursive From 96e5c7a46eb62a1b707cefb2628f8fc7fe6f73bb Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 10:29:04 +0200 Subject: [PATCH 12/42] Configure --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 226f442fdc3..3c53b891ca6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,3 +13,10 @@ jobs: - name: Update submodules run: git submodule update --init --recursive + + - name: Make builddir + run: ${{ env.GITHUB_WORKSPACE }/build + + - name: Configure Qt + working-directory: ${{ env.GITHUB_WORKSPACE }/build + run: ${{ env.GITHUB_WORKSPACE }/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ From 454797d2699f433e46282b977ae19280f6106e49 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 10:30:06 +0200 Subject: [PATCH 13/42] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c53b891ca6..b0779e2e3ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,8 +15,8 @@ jobs: run: git submodule update --init --recursive - name: Make builddir - run: ${{ env.GITHUB_WORKSPACE }/build + run: ${{ env.GITHUB_WORKSPACE }}/build - name: Configure Qt working-directory: ${{ env.GITHUB_WORKSPACE }/build - run: ${{ env.GITHUB_WORKSPACE }/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ + run: ${{ env.GITHUB_WORKSPACE }}/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ From df7da9bb737636a5a53e62624f96a6d2de47dda5 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 10:37:05 +0200 Subject: [PATCH 14/42] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0779e2e3ad..28109f5debd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,5 +18,5 @@ jobs: run: ${{ env.GITHUB_WORKSPACE }}/build - name: Configure Qt - working-directory: ${{ env.GITHUB_WORKSPACE }/build + working-directory: ${{ env.GITHUB_WORKSPACE }}/build run: ${{ env.GITHUB_WORKSPACE }}/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ From 04bc04053965ad85c13f865c5dd4222b7c012813 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 10:44:30 +0200 Subject: [PATCH 15/42] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28109f5debd..c49b46d31de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: run: git submodule update --init --recursive - name: Make builddir - run: ${{ env.GITHUB_WORKSPACE }}/build + run: mkdir ${{ env.GITHUB_WORKSPACE }}/build - name: Configure Qt working-directory: ${{ env.GITHUB_WORKSPACE }}/build From 8c9f5e9f6cd1aa01e1ad9e1918b3e5cb32e84f4c Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 11:16:24 +0200 Subject: [PATCH 16/42] Update build.yml --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c49b46d31de..4ebb3fa1213 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,8 @@ on: jobs: build: runs-on: ubuntu-latest + env: + BUILD_DIR: "${{ github.workspace }}/build" steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -15,8 +17,8 @@ jobs: run: git submodule update --init --recursive - name: Make builddir - run: mkdir ${{ env.GITHUB_WORKSPACE }}/build + run: mkdir ${{ env.BUILD_DIR }} - name: Configure Qt - working-directory: ${{ env.GITHUB_WORKSPACE }}/build + working-directory: ${{ env.BUILD_DIR }} run: ${{ env.GITHUB_WORKSPACE }}/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ From 61221e5f4ae4d3de33d97309e5c74b44e22557c6 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 11:18:26 +0200 Subject: [PATCH 17/42] Update build.yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ebb3fa1213..4d212942f72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,12 +13,12 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - name: Update submodules - run: git submodule update --init --recursive - - name: Make builddir run: mkdir ${{ env.BUILD_DIR }} + - name: Update submodules + run: git submodule update --init --recursive + - name: Configure Qt working-directory: ${{ env.BUILD_DIR }} run: ${{ env.GITHUB_WORKSPACE }}/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ From fb4d7f191c39a16dc02067011f1f1bb8f4e35ce9 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 11:34:00 +0200 Subject: [PATCH 18/42] Update build.yml --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d212942f72..6cebe1523bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,9 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 + + - name: PWD + run: pwd - name: Make builddir run: mkdir ${{ env.BUILD_DIR }} @@ -21,4 +24,4 @@ jobs: - name: Configure Qt working-directory: ${{ env.BUILD_DIR }} - run: ${{ env.GITHUB_WORKSPACE }}/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ + run: ${{ github.workspace }}/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ From 95eea01ce3a454d6eae050fce7117c9b9b5a5198 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 11:39:10 +0200 Subject: [PATCH 19/42] Update build.yml --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cebe1523bd..a673906395b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,9 @@ jobs: - uses: actions/checkout@v2 - name: PWD - run: pwd + run: | + pwd + echo ${{ github.workspace }}/qt5 - name: Make builddir run: mkdir ${{ env.BUILD_DIR }} From 924a24b995bfb762eed5908e43ca7f0affb0929d Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 11:41:31 +0200 Subject: [PATCH 20/42] Update build.yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a673906395b..edff22d6c69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: build: runs-on: ubuntu-latest env: - BUILD_DIR: "${{ github.workspace }}/build" + BUILD_DIR: "${{ github.workspace }}/../build" steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -16,7 +16,7 @@ jobs: - name: PWD run: | pwd - echo ${{ github.workspace }}/qt5 + echo ${{ github.workspace }} - name: Make builddir run: mkdir ${{ env.BUILD_DIR }} @@ -26,4 +26,4 @@ jobs: - name: Configure Qt working-directory: ${{ env.BUILD_DIR }} - run: ${{ github.workspace }}/qt5/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ + run: ${{ github.workspace }}/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ From 1cde9da16ace0d4195358b9d956b0ed3a41f1aca Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 11:55:10 +0200 Subject: [PATCH 21/42] Update build.yml --- .github/workflows/build.yml | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index edff22d6c69..0ee9e76585d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,12 +5,11 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: BUILD_DIR: "${{ github.workspace }}/../build" steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - name: PWD @@ -20,6 +19,36 @@ jobs: - name: Make builddir run: mkdir ${{ env.BUILD_DIR }} + + # Debian Dependencies + # https://wiki.qt.io/Building_Qt_5_from_Git + + - name: Add Qt Source Dependencies + if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' + run: | + sudo sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list + sudo apt-get update + sudo apt-get build-dep qt5-default + + - name: Add Libxcb Dependencies + if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' + run: | + sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev + + - name: Add Qt WebEngine Dependencies + if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' + run: | + sudo apt-get install libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libdbus-1-dev libfontconfig1-dev libcap-dev libxtst-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libxss-dev libegl1-mesa-dev gperf bison + + - name: Add Qt Multimedia Dependencies - using GStreamer 1.0 + if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' + run: | + sudo apt-get install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev + + - name: Add QDoc Documentation Generator Tool Dependencies + if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' + run: | + sudo apt install libclang-6.0-dev llvm-6.0 - name: Update submodules run: git submodule update --init --recursive From 80c96e3fedbb881e3f06c4f09c19cae60f07a847 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 12:00:14 +0200 Subject: [PATCH 22/42] Update build.yml --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ee9e76585d..be2f9b77531 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,10 +2,14 @@ name: Build Qt on: workflow_dispatch: - jobs: build: - runs-on: ubuntu-20.04 + strategy: + fail-fast: false + matrix: + os: [ubuntu-20.04] # ubuntu-18.04, macos-10.15, windows-2019, ubuntu-20.04 + + runs-on: ${{ matrix.os }} env: BUILD_DIR: "${{ github.workspace }}/../build" From fbc2c8ca315a668a91dc011fab561f2d6f1276f6 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 12:26:58 +0200 Subject: [PATCH 23/42] Update build.yml --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be2f9b77531..ffb9b4e6175 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,3 +60,7 @@ jobs: - name: Configure Qt working-directory: ${{ env.BUILD_DIR }} run: ${{ github.workspace }}/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ + + - name: Build Qt + working-directory: ${{ env.BUILD_DIR }} + run: make -j 4 From 463a0471e5e8012eda22369e5b868ed45b30289d Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 13:09:12 +0200 Subject: [PATCH 24/42] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd9e0c4801f..ee90e608b85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ -name: CI +name: Check Submodule Consistency on: push: From 07516fcdc785b9e1a4d655f1a806cb4b3af49b5b Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 13:09:36 +0200 Subject: [PATCH 25/42] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a52ac574a90..c7f00a569c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ # This is a basic workflow that is manually triggered -name: Manual workflow +name: Release Qt # Controls when the action will run. Workflow runs when manually triggered using the UI # or API. From d4014c0969d68cf509a82e097f4c068b3cdbd9ca Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 14:09:34 +0200 Subject: [PATCH 26/42] Update release.yml --- .github/workflows/release.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c7f00a569c6..310a784bf19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,15 +17,24 @@ on: # Input has to be provided for the workflow to run required: true -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "greet" greet: - # The type of runner that the job will run on runs-on: ubuntu-latest + env: + WORK_DIR: "${{ github.workspace }}/.." - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Runs a single command using the runners shell - - name: Send greeting - run: echo "Hello ${{ github.event.inputs.name }}" + - uses: actions/checkout@v2 + + - name: Get git-archive-all + working-directory: ${{ env.WORK_DIR }} + run: | + git clone https://github.com/Kentzo/git-archive-all.git + cd git-archive-all + git checkput 1.23.0 + + - name: Send greeting + run: echo "Hello ${{ github.event.inputs.name }}" + + - name: Make archive + run: ../git-archive-all/git_archive_all.py --version From 217384b0ec9885dd75e998a94a4406ac165d5075 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 14:10:34 +0200 Subject: [PATCH 27/42] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 310a784bf19..35f588b7f60 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: run: | git clone https://github.com/Kentzo/git-archive-all.git cd git-archive-all - git checkput 1.23.0 + git checkout 1.23.0 - name: Send greeting run: echo "Hello ${{ github.event.inputs.name }}" From 2a108a937e468124190f76bcda17c4f0bb7857fb Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 14:14:59 +0200 Subject: [PATCH 28/42] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 35f588b7f60..d426cc8bd09 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ on: required: true jobs: - greet: + make_archive: runs-on: ubuntu-latest env: WORK_DIR: "${{ github.workspace }}/.." @@ -37,4 +37,4 @@ jobs: run: echo "Hello ${{ github.event.inputs.name }}" - name: Make archive - run: ../git-archive-all/git_archive_all.py --version + run: ../git-archive-all/git_archive_all.py -v --force-submodules archive_name From 33d0208d8db20df0c6da41a66e3a404bc0e41fb7 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 14:16:10 +0200 Subject: [PATCH 29/42] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d426cc8bd09..f5c4e9bea10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,4 +37,4 @@ jobs: run: echo "Hello ${{ github.event.inputs.name }}" - name: Make archive - run: ../git-archive-all/git_archive_all.py -v --force-submodules archive_name + run: ../git-archive-all/git_archive_all.py -v --force-submodules archive_name.tar.gz From caaef8d0fc8363498b99930c64cd2ee53028dad6 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 14:27:30 +0200 Subject: [PATCH 30/42] Update release.yml --- .github/workflows/release.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f5c4e9bea10..dfdf4387792 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,18 +3,12 @@ name: Release Qt -# Controls when the action will run. Workflow runs when manually triggered using the UI -# or API. on: workflow_dispatch: - # Inputs the workflow accepts. inputs: - name: - # Friendly description to be shown in the UI instead of 'name' - description: 'Person to greet' - # Default value if no value is explicitly provided - default: 'World' - # Input has to be provided for the workflow to run + archive_name: + description: 'Archive name' + default: 'qt-everywhere-src-5.15.2' required: true jobs: @@ -33,8 +27,11 @@ jobs: cd git-archive-all git checkout 1.23.0 - - name: Send greeting - run: echo "Hello ${{ github.event.inputs.name }}" - - name: Make archive - run: ../git-archive-all/git_archive_all.py -v --force-submodules archive_name.tar.gz + run: ../git-archive-all/git_archive_all.py -v --force-submodules ${{ github.event.inputs.archive_name }}.tar.xz + + - name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: ${{ github.event.inputs.archive_name }}.tar.xz + path: ${{ github.event.inputs.archive_name }}.tar.xz From d779a349ca40da85bc107eb51f0f723f8663b69e Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 16:31:47 +0200 Subject: [PATCH 31/42] Try to add create release and upload asset steps --- .github/workflows/release.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfdf4387792..de0ec144887 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,3 +35,25 @@ jobs: with: name: ${{ github.event.inputs.archive_name }}.tar.xz path: ${{ github.event.inputs.archive_name }}.tar.xz + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: false + + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + asset_path: ${{ github.event.inputs.archive_name }}.tar.xz + asset_name: ${{ github.event.inputs.archive_name }}.tar.xz + asset_content_type: application/gzip From 8c59da5e2318899e4df4177f1a15306a9e649231 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 16:42:08 +0200 Subject: [PATCH 32/42] Try mac-os again --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffb9b4e6175..41f12d2b651 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] # ubuntu-18.04, macos-10.15, windows-2019, ubuntu-20.04 + os: [macos-10.15] # ubuntu-18.04, ubuntu-20.04, macos-10.15, windows-2019, ubuntu-20.04 runs-on: ${{ matrix.os }} env: From 6fc8757d588fd70c805cfd5e7dc396ae44f6c56a Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 16:51:35 +0200 Subject: [PATCH 33/42] Update build.yml --- .github/workflows/build.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41f12d2b651..b5b9fa6c946 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-10.15] # ubuntu-18.04, ubuntu-20.04, macos-10.15, windows-2019, ubuntu-20.04 + os: [ubuntu-18.04, ubuntu-20.04, macos-10.15] # ubuntu-18.04, ubuntu-20.04, macos-10.15, windows-2019, ubuntu-20.04 runs-on: ${{ matrix.os }} env: @@ -15,52 +15,53 @@ jobs: steps: - uses: actions/checkout@v2 - - - name: PWD - run: | - pwd - echo ${{ github.workspace }} - - name: Make builddir + - name: "[All] Make builddir" run: mkdir ${{ env.BUILD_DIR }} # Debian Dependencies # https://wiki.qt.io/Building_Qt_5_from_Git - - name: Add Qt Source Dependencies + - name: "[Linux] Add Qt Source Dependencies" if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' run: | sudo sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list sudo apt-get update sudo apt-get build-dep qt5-default - - name: Add Libxcb Dependencies + - name: "[Linux] Add Libxcb Dependencies" if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' run: | sudo apt-get install '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev - - name: Add Qt WebEngine Dependencies + - name: "[Linux] Add Qt WebEngine Dependencies" if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' run: | sudo apt-get install libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libdbus-1-dev libfontconfig1-dev libcap-dev libxtst-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libxss-dev libegl1-mesa-dev gperf bison - - name: Add Qt Multimedia Dependencies - using GStreamer 1.0 + - name: "[Linux] Add Qt Multimedia Dependencies - using GStreamer 1.0" if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' run: | sudo apt-get install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev - - name: Add QDoc Documentation Generator Tool Dependencies + - name: "[Linux] Add QDoc Documentation Generator Tool Dependencies" if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' run: | sudo apt install libclang-6.0-dev llvm-6.0 - - name: Update submodules + - name: "[All] Update submodules" run: git submodule update --init --recursive - - name: Configure Qt + - name: "[Linux] Configure Qt" + if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-18.04' working-directory: ${{ env.BUILD_DIR }} run: ${{ github.workspace }}/configure -opensource -confirm-license -nomake examples -nomake tests -release -platform linux-clang-libc++ - - name: Build Qt + - name: "[Mac] Configure Qt" + if: matrix.os == 'macos-10.15' + working-directory: ${{ env.BUILD_DIR }} + run: ${{ github.workspace }}/configure -opensource -confirm-license -nomake examples -nomake tests -release -no-framework -platform macx-clang + + - name: "[All] Build Qt" working-directory: ${{ env.BUILD_DIR }} run: make -j 4 From b87e44444201f79f9429b49f5a0646ab813b4e87 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 18:18:45 +0200 Subject: [PATCH 34/42] Update release.yml --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de0ec144887..a92928ed7cb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,9 @@ jobs: cd git-archive-all git checkout 1.23.0 + - name: "[All] Update submodules" + run: git submodule update --init --recursive + - name: Make archive run: ../git-archive-all/git_archive_all.py -v --force-submodules ${{ github.event.inputs.archive_name }}.tar.xz From 7610eb0e75246c307c1a68e4cd8523aeeb091af2 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 18:35:48 +0200 Subject: [PATCH 35/42] Update release.yml --- .github/workflows/release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a92928ed7cb..0a1bb96da1e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,16 +30,20 @@ jobs: - name: "[All] Update submodules" run: git submodule update --init --recursive - - name: Make archive - run: ../git-archive-all/git_archive_all.py -v --force-submodules ${{ github.event.inputs.archive_name }}.tar.xz + - name: Make archive + working-directory: ${{ env.WORK_DIR }} + run: tar --exclude-vcs -cJfv qt-everywhere-src-5.15.2.tar.xz ./qt5 + # run: ../git-archive-all/git_archive_all.py -v --force-submodules ${{ github.event.inputs.archive_name }}.tar.xz - name: Upload artifact + working-directory: ${{ env.WORK_DIR }} uses: actions/upload-artifact@v2 with: name: ${{ github.event.inputs.archive_name }}.tar.xz path: ${{ github.event.inputs.archive_name }}.tar.xz - name: Create Release + working-directory: ${{ env.WORK_DIR }} id: create_release uses: actions/create-release@v1 env: @@ -51,6 +55,7 @@ jobs: prerelease: false - name: Upload Release Asset + working-directory: ${{ env.WORK_DIR }} id: upload-release-asset uses: actions/upload-release-asset@v1 env: From 692822ad0d6d73c81b0ee6db0170737ae727785e Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 18:41:15 +0200 Subject: [PATCH 36/42] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a1bb96da1e..2626a518af1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,9 +35,9 @@ jobs: run: tar --exclude-vcs -cJfv qt-everywhere-src-5.15.2.tar.xz ./qt5 # run: ../git-archive-all/git_archive_all.py -v --force-submodules ${{ github.event.inputs.archive_name }}.tar.xz - - name: Upload artifact - working-directory: ${{ env.WORK_DIR }} + - name: Upload artifact uses: actions/upload-artifact@v2 + working-directory: ${{ env.WORK_DIR }} with: name: ${{ github.event.inputs.archive_name }}.tar.xz path: ${{ github.event.inputs.archive_name }}.tar.xz From 53267ce3c8bedbe3838587cbe98cfc65d09f0022 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 18:47:03 +0200 Subject: [PATCH 37/42] Update release.yml --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2626a518af1..96693754d1a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,10 +37,9 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v2 - working-directory: ${{ env.WORK_DIR }} with: name: ${{ github.event.inputs.archive_name }}.tar.xz - path: ${{ github.event.inputs.archive_name }}.tar.xz + path: ${{ env.WORK_DIR }}/${{ github.event.inputs.archive_name }}.tar.xz - name: Create Release working-directory: ${{ env.WORK_DIR }} From d6ef6f57bca0d9fa2ab1a2533e1144f5fb5715f5 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 18:49:46 +0200 Subject: [PATCH 38/42] Update release.yml --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96693754d1a..09baa12f498 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,6 @@ jobs: path: ${{ env.WORK_DIR }}/${{ github.event.inputs.archive_name }}.tar.xz - name: Create Release - working-directory: ${{ env.WORK_DIR }} id: create_release uses: actions/create-release@v1 env: @@ -54,13 +53,12 @@ jobs: prerelease: false - name: Upload Release Asset - working-directory: ${{ env.WORK_DIR }} id: upload-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ${{ github.event.inputs.archive_name }}.tar.xz + asset_path: ${{ env.WORK_DIR }}/${{ github.event.inputs.archive_name }}.tar.xz asset_name: ${{ github.event.inputs.archive_name }}.tar.xz asset_content_type: application/gzip From 10e43cb828bb316c6b3025862bb03bbd2adffb5c Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 19:06:42 +0200 Subject: [PATCH 39/42] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09baa12f498..d4b759c0e39 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: - name: Make archive working-directory: ${{ env.WORK_DIR }} - run: tar --exclude-vcs -cJfv qt-everywhere-src-5.15.2.tar.xz ./qt5 + run: tar --exclude-vcs -cJf qt-everywhere-src-5.15.2.tar.xz ./qt5 # run: ../git-archive-all/git_archive_all.py -v --force-submodules ${{ github.event.inputs.archive_name }}.tar.xz - name: Upload artifact From f844ccb58e1db18d42c7000f974e6d13532e4695 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 20:18:04 +0200 Subject: [PATCH 40/42] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4b759c0e39..e0175f97dd6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: make_archive: runs-on: ubuntu-latest env: - WORK_DIR: "${{ github.workspace }}/.." + WORK_DIR: "$HOME" steps: - uses: actions/checkout@v2 From 9daa0aa809419bc5efb7e7522092a767221e6edd Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 20:25:49 +0200 Subject: [PATCH 41/42] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e0175f97dd6..7660b0ab142 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: make_archive: runs-on: ubuntu-latest env: - WORK_DIR: "$HOME" + WORK_DIR: $HOME steps: - uses: actions/checkout@v2 From 2d074cd51093c92564bd3281bfb549c6c10f5bce Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Thu, 8 Apr 2021 20:29:23 +0200 Subject: [PATCH 42/42] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7660b0ab142..03483562e56 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: make_archive: runs-on: ubuntu-latest env: - WORK_DIR: $HOME + WORK_DIR: "/home/runner/work/qt5" steps: - uses: actions/checkout@v2