From 8e2a9797cd2ac1d1890dbca1346ebbd652693492 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 7 Sep 2021 01:01:56 +0100 Subject: [PATCH] [ci] clean up CI yml scripts --- .github/workflows/codeql.yml | 8 +++++++- .github/workflows/coverity.yml | 9 ++++++--- .github/workflows/mingw.yml | 8 ++++---- .github/workflows/vs2019.yml | 11 ++++++----- res/appstore/Package.appxmanifest | 2 +- src/rufus.rc | 10 +++++----- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1b4f7c7d..09755619 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -28,6 +28,8 @@ on: env: SOLUTION_FILE_PATH: ./rufus.sln + BUILD_CONFIGURATION: Debug + TARGET_PLATFORM: x64 jobs: CodeQL-Build: @@ -39,13 +41,17 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 + - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: languages: cpp + - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1 + - name: Build - run: msbuild ${{env.SOLUTION_FILE_PATH}} /m /p:Configuration=Debug,Platform=x64 + run: msbuild ${{env.SOLUTION_FILE_PATH}} /m /p:Configuration=${{ env.BUILD_CONFIGURATION}},Platform=${{ env.TARGET_PLATFORM }} + - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 5a10885e..14bdd158 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -16,6 +16,9 @@ on: env: SOLUTION_FILE_PATH: ./rufus.sln EMAIL: pete@akeo.ie + BUILD_CONFIGURATION: Debug + TARGET_PLATFORM: x64 + COVERITY_PROJECT_NAME: pbatard%2Frufus jobs: Coverity-Build: @@ -30,7 +33,7 @@ jobs: - name: Download Coverity run: | - curl -d "token=${{secrets.COVERITY_SCAN_TOKEN}}&project=pbatard%2Frufus" -L https://scan.coverity.com/download/cxx/win64 -o cov-analysis-win64.zip + curl -d "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=${{ env.COVERITY_PROJECT_NAME }}" -L https://scan.coverity.com/download/cxx/win64 -o cov-analysis-win64.zip 7z x cov-analysis-win64.zip del cov-analysis-win64.zip move cov-analysis-win64* cov-analysis-win64 @@ -43,9 +46,9 @@ jobs: uses: microsoft/setup-msbuild@v1 - name: Build with Coverity - run: cov-build.exe --dir cov-int msbuild ${{env.SOLUTION_FILE_PATH}} /m /p:Configuration=Release,Platform=x64 + run: cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ env.TARGET_PLATFORM }} - name: Upload Coverity build for analysis run: | 7z a -r cov-int.zip cov-int - curl --form email=${{env.EMAIL}} --form token=${{secrets.COVERITY_SCAN_TOKEN}} --form file=@cov-int.zip --form version="${{env.GITHUB_SHA}}" --form description="rufus" https://scan.coverity.com/builds?project=pbatard%2Frufus + curl --form email=${{ env.EMAIL }} --form token=${{ secrets.COVERITY_SCAN_TOKEN }} --form file=@cov-int.zip --form version="${{ env.GITHUB_SHA }}" --form description="Automated build" https://scan.coverity.com/builds?project=${{ env.COVERITY_PROJECT_NAME }} diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 0036963c..7448aa80 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -42,10 +42,10 @@ jobs: - name: Install MinGW uses: msys2/setup-msys2@v2 with: - msystem: ${{matrix.sys}} + msystem: ${{ matrix.sys }} update: true install: >- - mingw-w64-${{matrix.env}}-toolchain + mingw-w64-${{ matrix.env }}-toolchain base-devel git upx @@ -70,8 +70,8 @@ jobs: - name: Upload to VirusTotal if: ${{ matrix.env == 'i686' && github.event_name == 'push' }} run: | - curl --request POST --url https://www.virustotal.com/vtapi/v2/file/scan --form apikey=${{secrets.VIRUSTOTAL_API_KEY}} --form file=@./rufus.exe - curl --request POST --url https://www.virustotal.com/api/v3/monitor/items --header 'x-apikey: ${{secrets.VIRUSTOTAL_API_KEY}}' --form path='/rufus.exe' --form file=@./rufus.exe + curl --request POST --url https://www.virustotal.com/vtapi/v2/file/scan --form apikey=${{ secrets.VIRUSTOTAL_API_KEY }} --form file=@./rufus.exe + curl --request POST --url https://www.virustotal.com/api/v3/monitor/items --header 'x-apikey: ${{ secrets.VIRUSTOTAL_API_KEY }}' --form path='/rufus.exe' --form file=@./rufus.exe - name: Upload artifacts if: ${{ matrix.env == 'i686' && github.event_name == 'push' }} diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml index 5fcd3781..63b7d237 100644 --- a/.github/workflows/vs2019.yml +++ b/.github/workflows/vs2019.yml @@ -26,6 +26,7 @@ on: env: SOLUTION_FILE_PATH: ./rufus.sln + BUILD_CONFIGURATION: Release jobs: VS2019-Build: @@ -47,17 +48,17 @@ jobs: - name: Build run: | - msbuild ${{env.SOLUTION_FILE_PATH}} /m /p:Configuration=Release,Platform=${{matrix.TARGET_PLATFORM}} - move ./${{matrix.TARGET_PLATFORM}}/Release/rufus.exe ./rufus_${{matrix.TARGET_PLATFORM}}.exe + msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ matrix.TARGET_PLATFORM }} + move ./${{ matrix.TARGET_PLATFORM }}/Release/rufus.exe ./rufus_${{ matrix.TARGET_PLATFORM }}.exe - name: Display SHA-256 - run: sha256sum ./rufus_${{matrix.TARGET_PLATFORM}}.exe + run: sha256sum ./rufus_${{ matrix.TARGET_PLATFORM }}.exe - name: Upload to VirusTotal if: ${{ github.event_name == 'push' }} run: | - curl --request POST --url https://www.virustotal.com/vtapi/v2/file/scan --form apikey=${{secrets.VIRUSTOTAL_API_KEY}} --form file=@./rufus_${{matrix.TARGET_PLATFORM}}.exe - curl --request POST --url https://www.virustotal.com/api/v3/monitor/items --header 'x-apikey: ${{secrets.VIRUSTOTAL_API_KEY}}' --form path='/rufus_${{matrix.TARGET_PLATFORM}}.exe' --form file=@./rufus_${{matrix.TARGET_PLATFORM}}.exe + curl --request POST --url https://www.virustotal.com/vtapi/v2/file/scan --form apikey=${{ secrets.VIRUSTOTAL_API_KEY }} --form file=@./rufus_${{ matrix.TARGET_PLATFORM }}.exe + curl --request POST --url https://www.virustotal.com/api/v3/monitor/items --header 'x-apikey: ${{ secrets.VIRUSTOTAL_API_KEY }}' --form path='/rufus_${{ matrix.TARGET_PLATFORM }}.exe' --form file=@./rufus_${{ matrix.TARGET_PLATFORM }}.exe - name: Upload artifacts uses: actions/upload-artifact@v2 diff --git a/res/appstore/Package.appxmanifest b/res/appstore/Package.appxmanifest index 83519fd2..2e014761 100644 --- a/res/appstore/Package.appxmanifest +++ b/res/appstore/Package.appxmanifest @@ -11,7 +11,7 @@ + Version="3.16.1816.0" /> Rufus diff --git a/src/rufus.rc b/src/rufus.rc index bbe965b5..0ba51202 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.16.1814" +CAPTION "Rufus 3.16.1816" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -395,8 +395,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,16,1814,0 - PRODUCTVERSION 3,16,1814,0 + FILEVERSION 3,16,1816,0 + PRODUCTVERSION 3,16,1816,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -414,13 +414,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.16.1814" + VALUE "FileVersion", "3.16.1816" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-3.16.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.16.1814" + VALUE "ProductVersion", "3.16.1816" END END BLOCK "VarFileInfo"