Fix renaming

.github/workflows/test.yaml

@@ -30,21 +30,21 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Install Rust
-        run: rustup update 1.69
+        run: rustup update 1.72
 
       - name: Install rename
         run: sudo apt-get install -y rename
 
-      - name: Install target
-        run: rustup target add wasm32-unknown-unknown
+      - name: Install rust deps
+        run: make install
 
       - name: Run tests
         run: cargo test --workspace --exclude hpl-tests
 
       - name: Build wasm
         run: make ci-build
 
-      - name: Upload artifacts
+      - name: Upload wasm archive
         uses: actions/upload-artifact@v2
         with:
           name: wasm_codes

Makefile

@@ -1,22 +1,22 @@
-
 clean:
 	@cargo clean
 	@rm -rf ./artifacts
 
+install:
+	cargo install cw-optimizoor cosmwasm-check beaker
+  rustup target add wasm32-unknown-unknown
+
 schema:
 	ls ./contracts | xargs -n 1 -t beaker wasm ts-gen
 
-ci-build:
-	cargo install cw-optimizoor --force
-	cargo cw-optimizoor
-	rename 's/(.*)(-x86_64)(.*)/$1$3/d' *
-	cd artifacts && zip -r ../wasm_codes.zip * && cd ../
-
 build:
+	cargo build
 	cargo wasm
-
-build-dev: clean
 	cargo cw-optimizoor
+	rename --force 's/(.*)-(.*)\.wasm/$$1\.wasm/d' artifacts/*
 
-check: build-dev
+check: build
 	ls -d ./artifacts/*.wasm | xargs -I x cosmwasm-check x
+
+ci-build: check
+	zip -jr wasm_codes.zip artifacts