From 74154ccb7a162a16e487399b209b9270149b3bac Mon Sep 17 00:00:00 2001 From: Dongxu Li Date: Tue, 2 Apr 2024 20:35:46 -0400 Subject: [PATCH] CI: updated versions --- .github/workflows/build-all.yml | 47 ++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml index 13b8b92a72..689ef04b04 100644 --- a/.github/workflows/build-all.yml +++ b/.github/workflows/build-all.yml @@ -6,19 +6,17 @@ on: jobs: BuildLinux: - runs-on: ubuntu-22.04 - env: - platform_version: 22.04 + runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@main with: fetch-depth: 0 - name: Install Qt6 uses: jurplel/install-qt-action@v3 with: - version: '6.5.*' + version: '6.6.*' - name: Install Qt and dependencies run: | @@ -64,6 +62,11 @@ jobs: find unix/ ./CI/build-appimg.sh + - name: List files + run: | + echo ${{ github.workspace }} && ls ${{ github.workspace }} + shell: bash + - name: Upload artifact uses: actions/upload-artifact@v3 with: @@ -75,14 +78,14 @@ jobs: runs-on: macos-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@main with: fetch-depth: 0 - name: Install Qt6 uses: jurplel/install-qt-action@v3 with: - version: '6.5.*' + version: '6.6.*' - name: Install boost dependencies run: | @@ -94,7 +97,7 @@ jobs: mv LibreCAD.dmg LibreCAD-`git describe --always`.dmg - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@main with: name: assets path: LibreCAD*.dmg @@ -104,7 +107,7 @@ jobs: runs-on: windows-2019 steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@main with: fetch-depth: 0 @@ -121,7 +124,7 @@ jobs: - name: Install Qt6 uses: jurplel/install-qt-action@v3 with: - version: '6.5.3' + version: '6.6.2' host: 'windows' arch: 'win64_mingw' target: 'desktop' @@ -137,9 +140,9 @@ jobs: - name: Install boost shell: bash run: | - curl -# -L -o boost.7z https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.7z + curl -# -L -o boost.7z https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.7z 7z x -o. -y boost.7z - mv boost_1_75_0 ../boost + mv boost_1_83_0 ../boost rm boost.7z - name: Debugging @@ -162,11 +165,11 @@ jobs: echo. dir ..\Qt echo. - dir ..\Qt\6.5.3\ + dir ..\Qt\6.6.2\ echo. - dir ..\Qt\6.5.3\mingw_64\ + dir ..\Qt\6.6.2\mingw_64\ echo. - dir ..\Qt\6.5.3\mingw_64\bin + dir ..\Qt\6.6.2\mingw_64\bin - name: Build run: | @@ -184,25 +187,31 @@ jobs: mv generated/LibreCAD-Installer.exe LibreCAD-Installer-x64-`git describe --always`.exe shell: bash + - name: List files + run: | + echo "${{ github.workspace }}" + dir "${{ github.workspace }}" + shell: cmd + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: assets - path: LibreCAD-Installer*.exe + path: LibreCAD*.exe retention-days: 2 UpdateAssets: if: github.repository_owner == 'LibreCAD' needs: [BuildLinux, BuildMacOS, BuildWindows64] - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@main with: fetch-depth: 0 - name: Fetch artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@main - name: Upload latest pre-release uses: "marvinpinto/action-automatic-releases@latest"