diff --git a/.github/workflows/build-on-pull_req.yml b/.github/workflows/build-on-pull_req.yml index cde3fa0..bf56e31 100644 --- a/.github/workflows/build-on-pull_req.yml +++ b/.github/workflows/build-on-pull_req.yml @@ -1,7 +1,7 @@ -name: CI on PRs with SDK for 2.2.0 (i486) +name: CI on PRs with SDK for 3.0.2 (i486) env: - RELEASE: 2.2.0.29 + RELEASE: 3.0.2.8 ARCH: i486 # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 3 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1 @@ -50,13 +50,14 @@ jobs: - name: Build ${{ env.ARCH }} uses: coderus/github-sfos-build@old-stable with: - # Solely builds for i486 on 2.2.0, because of https://github.com/sailfishos-patches/patchmanager/pull/437#issuecomment-1615317003 + # Solely builds for i486 on 3.0.2, because of https://github.com/sailfishos-patches/patchmanager/pull/437#issuecomment-1615317003 + # and https://github.com/sailfishos-applications/filecase/issues/45 release: ${{ env.RELEASE }} arch: ${{ env.ARCH }} - name: Upload build result uses: actions/upload-artifact@v3 with: - name: RPM-build-results_${{ github.base_ref }}-${{ env.ARCH }}-SFOS2.2.0+ + name: RPM-build-results_${{ github.base_ref }}-${{ env.ARCH }}-SFOS${{ env.RELEASE }}+ path: RPMS/ diff --git a/.github/workflows/build-on-tags.yml b/.github/workflows/build-on-tags.yml index d2febb8..59ed0ea 100644 --- a/.github/workflows/build-on-tags.yml +++ b/.github/workflows/build-on-tags.yml @@ -66,11 +66,54 @@ jobs: path: RPMS/ - SDK-310: + SDK-302: runs-on: ubuntu-22.04 env: # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk - RELEASE: 3.1.0.12 + RELEASE: 3.0.2.8 + # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes. + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 + steps: + + - name: Checkout + uses: actions/checkout@v3 + + # Caching Docker images is not ready yet, see + # https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md + #- name: Cache Docker images of the Sailfish-SDK + # id: cache-sdk + # uses: actions/cache@v3 + # with: + # path: $GITHUB_WORKSPACE/… + # key: cache + + - name: Prepare + run: mkdir RPMS + + - name: Build armv7hl on ${{ env.RELEASE }} + uses: coderus/github-sfos-build@old-stable + with: + release: ${{ env.RELEASE }} + arch: armv7hl + + - name: Build i486 on ${{ env.RELEASE }} + uses: coderus/github-sfos-build@old-stable + with: + release: ${{ env.RELEASE }} + arch: i486 + + - name: Upload build results + uses: actions/upload-artifact@v3 + with: + name: RPM-build-results_SFOS${{ env.RELEASE }}+ + path: RPMS/ + + + SDK-320: + runs-on: ubuntu-22.04 + env: + # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk + RELEASE: 3.2.0.12 # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 steps: @@ -158,11 +201,11 @@ jobs: path: RPMS/ - SDK-440: + SDK-430: runs-on: ubuntu-22.04 env: # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk - RELEASE: 4.4.0.68 + RELEASE: 4.3.0.12 # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes. SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 steps: