From 9d6a8b017b4e537cbbd757747a2009595ec00347 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 22 Nov 2024 14:55:04 -0300 Subject: [PATCH 1/3] actions update, nightly to latest --- .github/workflows/nightly-ok.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/nightly-ok.yml b/.github/workflows/nightly-ok.yml index d68f24c5fce..422cab2d27b 100644 --- a/.github/workflows/nightly-ok.yml +++ b/.github/workflows/nightly-ok.yml @@ -2,24 +2,25 @@ name: nightly-linux64 on: schedule: - - cron: "0 6 * * *" + - cron: "0 6 * * *" workflow_dispatch: inputs: - release: - description: 'release' - required: true - default: 'latest' + release: + description: 'release' + required: true + default: 'latest' env: ccache: ccache + RELEASE: latest jobs: build-nightly-ok: runs-on: ubuntu-24.04 if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master' strategy: - matrix: - cfg: - - {target: linux64, libs: 64gcc6} + matrix: + cfg: + - {target: linux64, libs: 64gcc6} env: TARGET: ${{matrix.cfg.target}} steps: @@ -51,9 +52,9 @@ jobs: - name: Update Release uses: IsaacShelton/update-existing-release@v1.3.4 with: - token: ${{ secrets.GITHUB_TOKEN }} - tag: nightly - release: nightly - prerelease: false - replace: true - files: ${{ steps.createpackage.outputs.FILES_OUT }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} + tag: nightly + release: nightly + prerelease: false + replace: true + files: ${{ steps.createpackage.outputs.FILES_OUT }} \ No newline at end of file From e232e6d7a6f88e87579c5329e7de6b2b618bf505 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 22 Nov 2024 18:34:05 -0300 Subject: [PATCH 2/3] update actions script --- .github/workflows/of.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index 8635e7b7d63..886eb68c489 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -47,7 +47,7 @@ jobs: # echo "RELEASE=latest" >> $GITHUB_ENV # fi - name: Download libs - run: ./scripts/$TARGET/download_libs.sh + run: ./scripts/$TARGET/download_libs.sh -t $RELEASE - name: Install dependencies run: ./scripts/ci/$TARGET/install.sh - name: Build @@ -199,7 +199,7 @@ jobs: # echo "RELEASE=latest" >> $GITHUB_ENV # fi - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}} -t $RELEASE; + run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}} - name: Install dependencies run: ./scripts/ci/linuxrpi/install.sh; - name: LS @@ -290,7 +290,7 @@ jobs: key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} - name: Download libs - run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}} -t $RELEASE; + run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}} - name: Install dependencies run: ./scripts/ci/$TARGET/install.sh; - name: Build @@ -330,7 +330,7 @@ jobs: # key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} # - name: Download libs - # run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; + # run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}} # - name: Install dependencies # run: ./scripts/ci/$TARGET/install.sh; # - name: Build From b024664cbe93ebf8dd53e7b22174c6e96b90696f Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 22 Nov 2024 23:52:18 -0300 Subject: [PATCH 3/3] commented out some logic to have the date on nightly/latest builds compressed filenames --- .github/workflows/nightly-ok.yml | 4 ++-- scripts/ci/package_builds.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly-ok.yml b/.github/workflows/nightly-ok.yml index 422cab2d27b..97cefb2caac 100644 --- a/.github/workflows/nightly-ok.yml +++ b/.github/workflows/nightly-ok.yml @@ -45,7 +45,7 @@ jobs: - name: Download libs run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}; - name: Create Package - run: scripts/ci/package_builds.sh ${{ github.event.inputs.release }}; + run: ./scripts/ci/package_builds.sh ${{ github.event.inputs.release }}; id: createpackage - name: List output directory run: ls -lah out/ @@ -57,4 +57,4 @@ jobs: release: nightly prerelease: false replace: true - files: ${{ steps.createpackage.outputs.FILES_OUT }} \ No newline at end of file + files: ${{ steps.createpackage.outputs.FILES_OUT }} diff --git a/scripts/ci/package_builds.sh b/scripts/ci/package_builds.sh index d4cf5a113a6..0830abe2dc2 100755 --- a/scripts/ci/package_builds.sh +++ b/scripts/ci/package_builds.sh @@ -34,9 +34,9 @@ mkdir -p $OUTPUT_FOLDER RELEASE="${RELEASE:-latest}" lastversion=$(date +%Y%m%d) -if [ -n "$1" ] && [ "$1" != "nightly" ]; then - lastversion=$1 -fi +# if [ -n "$1" ] && [ "$1" != "nightly" ]; then + # lastversion=$1 +# fi echo "##[endgroup]" echo "##[group]submodule update and pull"