From c78ca635df8579c1d225b5f1b74e4e521f88b393 Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Thu, 29 Feb 2024 17:34:22 +0100 Subject: [PATCH] CI: Fixing the Fix First checkout the base, then nested stuff... Signed-off-by: Fini Jastrow --- .github/workflows/casks.yml | 5 ++--- .github/workflows/contributors.yml | 15 ++++++--------- .github/workflows/fontjson.yml | 21 ++++++++------------- .github/workflows/release.yml | 7 +++---- 4 files changed, 19 insertions(+), 29 deletions(-) diff --git a/.github/workflows/casks.yml b/.github/workflows/casks.yml index e98905f58b..8ffc5b7237 100644 --- a/.github/workflows/casks.yml +++ b/.github/workflows/casks.yml @@ -14,11 +14,10 @@ jobs: name: Create casks runs-on: ubuntu-latest steps: - - name: Fetch stuff (no checkout) + - name: Fetch stuff uses: actions/checkout@v4 with: - sparse-checkout: | - bin/scripts + sparse-checkout: bin/scripts - name: Fetch release artifacts run: | cd bin/scripts diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml index a9b47b6f8f..c593951f47 100644 --- a/.github/workflows/contributors.yml +++ b/.github/workflows/contributors.yml @@ -14,22 +14,19 @@ jobs: name: Update gh-pages contributors runs-on: ubuntu-latest steps: - - name: Get details and script from default branch + - name: Fetch pages from gh-pages uses: actions/checkout@v4 with: - sparse-checkout: | - . - bin/scripts - path: master - - name: Fetch old from gh-pages + ref: gh-pages + - name: Get details and script from default branch uses: actions/checkout@v4 with: - sparse-checkout: _posts - ref: gh-pages + sparse-checkout: bin/scripts + path: master - name: Combine branches run: | + mkdir -p bin cp master/CONTRIBUTORS.md . - mkdir -p bin/scripts mv master/bin/scripts bin/scripts - name: Update the page run: | diff --git a/.github/workflows/fontjson.yml b/.github/workflows/fontjson.yml index 52ca370af5..4aa4c65235 100644 --- a/.github/workflows/fontjson.yml +++ b/.github/workflows/fontjson.yml @@ -11,27 +11,22 @@ jobs: sync_pages: runs-on: ubuntu-latest steps: - - name: Fetch files + - name: Fetch gh-pages uses: actions/checkout@v4 with: - sparse-checkout: bin/scripts/lib - - - name: Prepare file - run: | - echo "Temp dir is /tmp" - cp bin/scripts/lib/fonts.json /tmp - ls -l /tmp/fonts.json + ref: gh-pages - - name: Fetch gh-pages + - name: Fetch files uses: actions/checkout@v4 with: - ref: gh-pages + sparse-checkout: bin/scripts/lib + path: master - - name: Prepare file 2 + - name: Prepare file run: | - ls -l /tmp/fonts.json mkdir temp_data - cp /tmp/fonts.json temp_data + cp master/bin/scripts/lib/fonts.json temp_data + ls -l temp_data - name: Deploy to gh-pages uses: JamesIves/github-pages-deploy-action@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a098a7169..3beac9bbf3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,11 +29,10 @@ jobs: if: ${{ github.repository_owner == 'ryanoasis' }} steps: - - uses: actions/checkout@v4 + - name: Fetch information + uses: actions/checkout@v4 with: - sparse-checkout: | - . - bin/scripts + sparse-checkout: bin/scripts - name: Determine font matrix id: set-matrix