diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 2a4b607..f3e77cf 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -18,7 +18,16 @@ concurrency: env: LANG: 'ja_JP.UTF-8' jobs: - build-github-desktop: + build-slides: + timeout-minutes: 30 + strategy: + fail-fast: false + matrix: + include: + - slide: git + output_name: github-desktop-slide + - slide: design + output_name: basic-design-slide runs-on: ubuntu-latest steps: - name: Checkout @@ -34,83 +43,43 @@ jobs: run: npm install -g @marp-team/marp-cli - name: Make Directory - run: mkdir dest && cp -r ./git/imgs ./dest/imgs + run: mkdir dest && cp -r ./${{ matrix.slide }}/imgs ./dest/imgs - - name: Build Marp git-tutorial PDF - run: marp $(cat config.json | jq -r .[0].directory)/slide.md + - name: Build Marp PDF + run: marp ${{ matrix.slide }}/slide.md --pdf - -o ./dest/$(cat config.json | jq -r .[0].output_name).pdf + -o ./dest/${{ matrix.output_name }}.pdf --allow-local-files - - name: Build Marp git-tutorial HTML - run: marp $(cat config.json | jq -r .[0].directory)/slide.md + - name: Build Marp HTML + run: marp ${{ matrix.slide }}/slide.md --html - -o ./dest/$(cat config.json | jq -r .[0].output_name).html + -o ./dest/${{ matrix.output_name }}.html --allow-local-files - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: git - path: ./dest - - build-basic-design: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup Pages - uses: actions/configure-pages@v3 - - - name: Setup Packages - run: sudo apt update && sudo apt install jq npm fonts-noto - - - name: Install Marp CLI - run: npm install -g @marp-team/marp-cli - - - name: Make Directory - run: mkdir dest && cp -r ./design/imgs ./dest/imgs - - - name: Build Marp design PDF - run: marp $(cat config.json | jq -r .[1].directory)/slide.md - --pdf - -o ./dest/$(cat config.json | jq -r .[1].output_name).pdf - --allow-local-files - - - name: Build Marp design HTML - run: marp $(cat config.json | jq -r .[1].directory)/slide.md - --html - -o ./dest/$(cat config.json | jq -r .[1].output_name).html - --allow-local-files - - - name: Upload Artifact - uses: actions/upload-artifact@v4 - with: - name: design + name: ${{ matrix.slide }} path: ./dest upload-slide: runs-on: ubuntu-latest needs: - - build-github-desktop - - build-basic-design + - build-slides steps: - name: Download git Artifact uses: actions/download-artifact@v4 - - name: Make Directory - run: mkdir pages && cp -r ./git ./pages/git && cp -r ./design ./pages/design - - name: Upload Slide Artifact uses: actions/upload-artifact@v4 with: - path: ./pages + path: ./ - name: Upload to GitHub Pages uses: actions/upload-pages-artifact@v1 with: - path: ./pages + path: ./ deploy: environment: diff --git a/config.json b/config.json deleted file mode 100644 index 294e570..0000000 --- a/config.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "directory": "git", - "output_name": "github-desktop-slide" - }, - { - "directory": "design", - "output_name": "basic-design-slide" - } -] \ No newline at end of file