git.delta.rocks / unique-network / refs/commits / e42f99deb83f

29    strategy:29    strategy:
30      matrix:30      matrix:
31        include:31        include:
32          - network: sapphire32          - network: "sapphire"
33            usage: "--sapphire"33            usage: ""
34          - network: "opal"34          - network: "opal"
35            usage: ""35            usage: ""
36          - network: "quartz"36          - network: "quartz"
70        with:70        with:
71          node-version: 1671          node-version: 16
7272
73      - name: Install jq73      # - name: Install jq
74        run: sudo apt install jq -y74      #   run: sudo apt install jq -y
7575
76      - name: Run generate_types_package script76      - name: Run generate_types_package script
77        working-directory: tests77        working-directory: tests

--- a/tests/scripts/generate_types_package.sh
+++ b/tests/scripts/generate_types_package.sh
@@ -9,12 +9,11 @@
 . $DIR/functions.sh
 
 usage() {
-	echo "Usage: [RPC_URL=http://localhost:9933] $0 <--rc|--release|--sapphire> [--force] [--push] [--rpc-url=http://localhost:9933]" 1>&2
+	echo "Usage: [RPC_URL=http://localhost:9933] $0 <--rc|--release> [--force] [--push] [--rpc-url=http://localhost:9933]" 1>&2
 	exit 1
 }
 
 rc=
-sapphire=
 release=
 force=
 push=
@@ -23,15 +22,11 @@
 case $i in
 	--rc)
 		rc=1
-		if test "$release" -o "$sapphire"; then usage; fi
-		;;
-	--sapphire)
-		sapphire=1
-		if test "$rc" -o "$release"; then usage; fi
+		if test "$release"; then usage; fi
 		;;
 	--release)
 		release=1
-		if test "$rc" -o "$sapphire"; then usage; fi
+		if test "$rc"; then usage; fi
 		;;
 	--force)
 		force=1
@@ -48,7 +43,7 @@
 esac
 done
 
-if test \( ! \( "$rc" -o "$release" -o "$sapphire" \) \) -o \( "${RPC_URL=}" = "" \); then
+if test \( ! \( "$rc" -o "$release" \) \) -o \( "${RPC_URL=}" = "" \); then
 	usage
 elif test "$rc"; then
 	echo "Rc build"
@@ -70,6 +65,11 @@
 		repo_branch=opal-testnet
 		repo_tag=$repo_branch
 		;;
+	sapphire)
+		package_name=@unique-nft/sapphire-mainnet-types
+		repo_branch=sapphire-mainnet
+		repo_tag=$repo_branch
+		;;
 	quartz)
 		package_name=@unique-nft/quartz-mainnet-types
 		repo_branch=quartz-mainnet
@@ -93,15 +93,6 @@
 	fi
 	package_name=@unique-nft/rc-types
 	repo_branch=rc
-	repo_tag=$repo_branch
-fi
-if test "$sapphire" = 1; then
-	if "$spec_name" != opal; then
-		echo "sapphire types can only be based on opal spec"
-		exit 1
-	fi
-	package_name=@unique-nft/sapphire-mainnet-types
-	repo_branch=sapphire-mainnet
 	repo_tag=$repo_branch
 fi