From 22528fafd23bd03374c4d2c11d73380a89dd2750 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 4 Aug 2023 09:26:02 -0700 Subject: [PATCH] 100% banish submodules (use package manager) Helps hexops/mach#902 Signed-off-by: Stephen Gutekanst --- .github/workflows/ci.yml | 6 ------ .github/workflows/m1_ci.yml | 6 ------ .github/workflows/update_examples.yml | 31 --------------------------- README.md | 4 ++-- 4 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/update_examples.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e9ff8c7..046ece83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - submodules: 'recursive' - name: Setup Zig run: | sudo apt install xz-utils @@ -54,8 +52,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - submodules: 'recursive' - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' @@ -73,8 +69,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - submodules: 'recursive' - name: Setup Zig run: | brew uninstall --ignore-dependencies libx11 # https://github.com/ziglang/zig/issues/11066 diff --git a/.github/workflows/m1_ci.yml b/.github/workflows/m1_ci.yml index d6a18d3d..4ce34c04 100644 --- a/.github/workflows/m1_ci.yml +++ b/.github/workflows/m1_ci.yml @@ -20,14 +20,8 @@ jobs: run: shell: '/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}' steps: - - name: Clean repository submodules - # See https://github.com/actions/checkout/issues/385 - run: | - rm -rf $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE - name: Checkout uses: actions/checkout@v2 - with: - submodules: 'recursive' - name: test run: zig build test - name: build diff --git a/.github/workflows/update_examples.yml b/.github/workflows/update_examples.yml deleted file mode 100644 index cc56fd8a..00000000 --- a/.github/workflows/update_examples.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Update examples -on: - push: - branches: - - "main" -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true -jobs: - publish: - if: github.repository_owner == 'hexops' - runs-on: ubuntu-latest - steps: - - name: Checkout hexops/mach-examples repo - uses: actions/checkout@v2 - with: - repository: hexops/mach-examples - token: ${{ secrets.HEXOPS_MACH_PUSH_SUBREPOS }} - submodules: 'true' - - name: 'mach-examples: update mach submodule' - run: | - cd libs/mach - git checkout origin/main - cd ../../ - - name: 'mach-examples: push submodule update' - run: | - git config user.name 'Release automation' - git config user.email 'stephen@hexops.com' - git add . - git commit -m 'libs: mach: update to latest main revision' - git push -u origin HEAD diff --git a/README.md b/README.md index 1fd30703..6ac1452b 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ Written in [Zig](https://ziglang.org/), Mach is for creating games, graphical ap ## Cross-platform graphics in ~60 seconds ```sh -git clone --recursive https://github.com/hexops/mach-examples +git clone https://github.com/hexops/mach-examples cd mach-examples/ -zig build run-core-boids +zig build run-sprite2d ``` Cross-platform graphics, a unified shader language & compute shaders.