diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10df1f0f5..825f0425a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,23 +70,10 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Nim - run: nimble setup - - - name: Get submodules hash - id: submodules - run: | - echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT - - - name: Cache submodules - uses: actions/cache@v3 - with: - path: | - vendor/ - .git/modules - key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }} + run: nimble setup --accept - name: Make update - run: make update + run: make update -j - name: Build binaries run: make V=1 QUICK_AND_DIRTY_COMPILER=1 all tools @@ -120,23 +107,10 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Nim - run: nimble setup - - - name: Get submodules hash - id: submodules - run: | - echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT - - - name: Cache submodules - uses: actions/cache@v3 - with: - path: | - vendor/ - .git/modules - key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }} + run: nimble setup --accept - name: Make update - run: make update + run: make update -j - name: Run tests run: | @@ -196,20 +170,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Nim - run: nimble setup - - - name: Get submodules hash - id: submodules - run: | - echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT - - - name: Cache submodules - uses: actions/cache@v3 - with: - path: | - vendor/ - .git/modules - key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }} + run: nimble setup --accept - name: Build nph run: | diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml index aeec68199..68417226e 100644 --- a/.github/workflows/container-image.yml +++ b/.github/workflows/container-image.yml @@ -55,28 +55,13 @@ jobs: - name: Install Nim if: ${{ steps.secrets.outcome == 'success' }} - run: nimble setup - - - name: Get submodules hash - id: submodules - if: ${{ steps.secrets.outcome == 'success' }} - run: | - echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT - - - name: Cache submodules - if: ${{ steps.secrets.outcome == 'success' }} - uses: actions/cache@v3 - with: - path: | - vendor/ - .git/modules - key: ${{ runner.os }}-vendor-modules-${{ steps.submodules.outputs.hash }} + run: nimble setup --accept - name: Build binaries id: build if: ${{ steps.secrets.outcome == 'success' }} run: | - make update + make update -j make -j${NPROC} V=1 QUICK_AND_DIRTY_COMPILER=1 NIMFLAGS="-d:disableMarchNative -d:postgres -d:chronicles_colors:none" wakunode2 diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index b6cdcebbe..dd406ee13 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -51,7 +51,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Nim - run: nimble setup + run: nimble setup --accept - name: prep variables id: vars diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml index f13f9529c..a20785bac 100644 --- a/.github/workflows/release-assets.yml +++ b/.github/workflows/release-assets.yml @@ -35,20 +35,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Nim - run: nimble setup - - - name: Get submodules hash - id: submodules - run: | - echo "hash=$(git submodule status | awk '{print $1}' | sort | shasum -a 256 | sed 's/[ -]*//g')" >> $GITHUB_OUTPUT - - - name: Cache submodules - uses: actions/cache@v3 - with: - path: | - vendor/ - .git/modules - key: ${{ runner.os }}-${{matrix.arch}}-submodules-${{ steps.submodules.outputs.hash }} + run: nimble setup --accept - name: Get tag id: version