fix: pr and test

.github/workflows/pr.yaml

@@ -0,0 +1,47 @@
+name: pr
+
+on:
+  pull_request:
+    branches:
+      - "main"
+
+jobs:
+  artifact:
+    permissions:
+      contents: write
+      pull-requests: write
+
+    name: artifact
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        run: |
+          rustup toolchain install 1.72 \
+            --profile minimal \
+            --target wasm32-unknown-unknown \
+            --no-self-update
+
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
+
+      - name: Install Deps
+        run: make install-prod
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build wasm
+        run: |
+          cargo generate-lockfile
+          make ci-build
+
+      - name: Pull request artifacts
+        uses: gavv/pull-request-artifacts@v2
+        with:
+          commit: ${{ github.event.pull_request.head.sha }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts-branch: artifacts
+          artifacts: |
+            wasm_codes.zip

.github/workflows/test.yaml

@@ -20,60 +20,19 @@ jobs:
         with:
           go-version: '1.21'
 
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
       - name: Install Rust
-        run: rustup update 1.72
-
-      - name: Install rename
-        run: sudo apt-get install -y rename
+        run: |
+          rustup toolchain install 1.72 \
+            --profile minimal \
+            --target wasm32-unknown-unknown \
+            --no-self-update
 
-      - name: Install rust deps
-        run: make install
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
 
       - name: Run tests
         run: cargo test --workspace --exclude hpl-tests
 
-  artifact:
-    permissions:
-      contents: write
-      pull-requests: write
-
-    name: artifact
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Dependencies
-        run: |
-          rustup update 1.72
-          sudo apt-get install -y rename
-          make install
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build wasm
-        run: make ci-build
-
-      - name: Pull request artifacts
-        uses: gavv/pull-request-artifacts@v2
-        with:
-          commit: ${{ github.event.pull_request.head.sha }}
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts-branch: artifacts
-          artifacts: |
-            wasm_codes.zip
-
   coverage:
     runs-on: ubuntu-latest
     env:
@@ -87,8 +46,13 @@ jobs:
 
       - name: Install Rust
         run: |
-          rustup update nightly
-          rustup target add wasm32-unknown-unknown
+          rustup toolchain install 1.72 \
+            --profile minimal \
+            --target wasm32-unknown-unknown \
+            --no-self-update
+
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
 
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov

Makefile

@@ -5,24 +5,34 @@ clean:
 	@cargo clean
 	@rm -rf ./artifacts
 
-install:
+install: install-dev
+
+install-dev: install-prod
+	cargo install --force cw-optimizoor beaker
+
+install-prod:
 	cargo install --force cosmwasm-check
 	rustup target add wasm32-unknown-unknown
 
 schema:
 	ls ./contracts | xargs -n 1 -t beaker wasm ts-gen
 
-build:
-	cargo build
-	cargo wasm
+check:
+	ls -d ./artifacts/*.wasm | xargs -I x cosmwasm-check x
+
+optimize:
 	docker run --rm -v "$(PWD)":/code \
 		--mount type=volume,source="$(BASE)_cache",target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
 		cosmwasm/optimizer:0.15.0
+
+optimize-fast:
+	cargo cw-optimizoor
 	rename --force 's/(.*)-(.*)\.wasm/$$1\.wasm/d' artifacts/*
 
-check: build
-	ls -d ./artifacts/*.wasm | xargs -I x cosmwasm-check x
+build: optimize-fast check
+	cargo build
+	cargo wasm
 
-ci-build: check
+ci-build: optimize check
 	zip -jr wasm_codes.zip artifacts