From 9c571166ce973a25cebf3f04307543e95d96f705 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 19 Apr 2023 11:08:04 -0300 Subject: [PATCH 1/2] cache test --- .github/workflows/build-linux.yml | 30 ++++++++++---- .github/workflows/build-macos.yml | 66 ++++++++++++++++--------------- 2 files changed, 56 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index bd4b7013..0d5839d6 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -22,11 +22,25 @@ jobs: env: TARGET: ${{matrix.cfg.target}} steps: - - name: Install libunwind - run: sudo apt-get install libunwind-dev - - uses: actions/checkout@v3 - - name: Build - run: - ./scripts/linux/buildPG.sh; - env: - GA_CI_SECRET: ${{ secrets.CI_SECRET }} + - name: pwd + run: pwd + + # - name: Install libunwind + # run: sudo apt-get install libunwind-dev + # - uses: actions/checkout@v3 + # - name: Cache OF + # id: cache-of + # uses: actions/cache@v3 + # env: + # cache-name: cache-keep-of + # with: + # path: | + # /Users/runner/work/projectGenerator/openFrameworks/** + # key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('openFrameworks/**/*.cpp') }} + # restore-keys: | + # ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}- + # - name: Build + # run: + # ./scripts/linux/buildPG.sh; + # env: + # GA_CI_SECRET: ${{ secrets.CI_SECRET }} diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 64289bca..310fb35a 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -16,39 +16,41 @@ jobs: build-osx: runs-on: macos-12 strategy: - matrix: - cfg: - - {target: osx} + matrix: + cfg: + - {target: osx} env: TARGET: ${{matrix.cfg.target}} steps: - - uses: actions/checkout@v3 - - name: Cache OF - id: cache-of - uses: actions/cache@v3 - env: - cache-name: cache-keep-of - with: - path: | - /Users/runner/work/projectGenerator/openFrameworks/** - key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('openFrameworks/**/*.cpp') }} - restore-keys: | - ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}- - - name: rm-dev - run: sudo rm -rf /Library/Developer - - name: Build - run: - ./scripts/osx/buildPG.sh; - env: - DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer" - SDKROOT: "/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" - # DEVELOPER_DIR: "/Applications/Xcode_14.2.app/Contents/Developer" - # SDKROOT: "/Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" - GA_CI_SECRET: ${{ secrets.CI_SECRET }} - CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }} - CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} - GA_APPLE_USERNAME: ${{ secrets.GA_APPLE_USERNAME }} - GA_APPLE_PASS: ${{ secrets.GA_APPLE_PASS }} - GA_NOTARIZE_PROVIDER: ${{ secrets.GA_NOTARIZE_PROVIDER }} - + - name: pwd + run: pwd + # steps: + # - uses: actions/checkout@v3 + # - name: Cache OF + # id: cache-of + # uses: actions/cache@v3 + # env: + # cache-name: cache-keep-of + # with: + # path: | + # /Users/runner/work/projectGenerator/openFrameworks/** + # key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('openFrameworks/**/*.cpp') }} + # restore-keys: | + # ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}- + # - name: rm-dev + # run: sudo rm -rf /Library/Developer + # - name: Build + # run: + # ./scripts/osx/buildPG.sh; + # env: + # DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer" + # SDKROOT: "/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + # # DEVELOPER_DIR: "/Applications/Xcode_14.2.app/Contents/Developer" + # # SDKROOT: "/Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + # GA_CI_SECRET: ${{ secrets.CI_SECRET }} + # CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }} + # CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} + # GA_APPLE_USERNAME: ${{ secrets.GA_APPLE_USERNAME }} + # GA_APPLE_PASS: ${{ secrets.GA_APPLE_PASS }} + # GA_NOTARIZE_PROVIDER: ${{ secrets.GA_NOTARIZE_PROVIDER }} From cbbd7fd7f3c8bb993fc70c05f0c6c0417772775b Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 19 Apr 2023 11:10:44 -0300 Subject: [PATCH 2/2] now pwd cache and list --- .github/workflows/build-linux.yml | 42 ++++++++++++---------- .github/workflows/build-macos.yml | 60 ++++++++++++++++--------------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 0d5839d6..abd2f88e 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -25,22 +25,26 @@ jobs: - name: pwd run: pwd - # - name: Install libunwind - # run: sudo apt-get install libunwind-dev - # - uses: actions/checkout@v3 - # - name: Cache OF - # id: cache-of - # uses: actions/cache@v3 - # env: - # cache-name: cache-keep-of - # with: - # path: | - # /Users/runner/work/projectGenerator/openFrameworks/** - # key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('openFrameworks/**/*.cpp') }} - # restore-keys: | - # ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}- - # - name: Build - # run: - # ./scripts/linux/buildPG.sh; - # env: - # GA_CI_SECRET: ${{ secrets.CI_SECRET }} + - name: Install libunwind + run: sudo apt-get install libunwind-dev + - uses: actions/checkout@v3 + - name: Cache OF + id: cache-of + uses: actions/cache@v3 + env: + cache-name: cache-keep-of + with: + path: | + /home/runner/work/projectGenerator/openFrameworks/** + key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('openFrameworks/**/*.cpp') }} + restore-keys: | + ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}- + - name: Build + run: + ./scripts/linux/buildPG.sh; + env: + GA_CI_SECRET: ${{ secrets.CI_SECRET }} + + + - name: LIST + run: ls -alFR \ No newline at end of file diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 310fb35a..928b889b 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -25,32 +25,34 @@ jobs: - name: pwd run: pwd - # steps: - # - uses: actions/checkout@v3 - # - name: Cache OF - # id: cache-of - # uses: actions/cache@v3 - # env: - # cache-name: cache-keep-of - # with: - # path: | - # /Users/runner/work/projectGenerator/openFrameworks/** - # key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('openFrameworks/**/*.cpp') }} - # restore-keys: | - # ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}- - # - name: rm-dev - # run: sudo rm -rf /Library/Developer - # - name: Build - # run: - # ./scripts/osx/buildPG.sh; - # env: - # DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer" - # SDKROOT: "/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" - # # DEVELOPER_DIR: "/Applications/Xcode_14.2.app/Contents/Developer" - # # SDKROOT: "/Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" - # GA_CI_SECRET: ${{ secrets.CI_SECRET }} - # CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }} - # CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} - # GA_APPLE_USERNAME: ${{ secrets.GA_APPLE_USERNAME }} - # GA_APPLE_PASS: ${{ secrets.GA_APPLE_PASS }} - # GA_NOTARIZE_PROVIDER: ${{ secrets.GA_NOTARIZE_PROVIDER }} + - uses: actions/checkout@v3 + - name: Cache OF + id: cache-of + uses: actions/cache@v3 + env: + cache-name: cache-keep-of + with: + path: | + /Users/runner/work/projectGenerator/openFrameworks/** + key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('openFrameworks/**/*.cpp') }} + restore-keys: | + ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}- + - name: rm-dev + run: sudo rm -rf /Library/Developer + - name: Build + run: + ./scripts/osx/buildPG.sh; + env: + DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer" + SDKROOT: "/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + # DEVELOPER_DIR: "/Applications/Xcode_14.2.app/Contents/Developer" + # SDKROOT: "/Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + GA_CI_SECRET: ${{ secrets.CI_SECRET }} + CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }} + CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} + GA_APPLE_USERNAME: ${{ secrets.GA_APPLE_USERNAME }} + GA_APPLE_PASS: ${{ secrets.GA_APPLE_PASS }} + GA_NOTARIZE_PROVIDER: ${{ secrets.GA_NOTARIZE_PROVIDER }} + + - name: LIST + run: ls -alFR \ No newline at end of file