Skip to content

Commit

Permalink
fix: CI build (#2)
Browse files Browse the repository at this point in the history
* chore: remove wasm build on ci

* chore: add details for publishing npm

* refactor: rename package name for publishing on npm

* refactor: rename to devarms; use public npm in ci

* wip: try to fix line break error on windows
  • Loading branch information
qqpann authored Feb 17, 2022
1 parent e3700d5 commit f349cb9
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 48 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/test_tauri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y webkit2gtk-4.0
- name: build wasm arms pkg
run: |
curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
cd arms
wasm-pack build --target web
cd ..
- name: install app dependencies and build it
run: yarn && yarn build
run: |
yarn remove devarms
yarn
yarn add devarms
yarn lint
yarn build
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@
"javascriptreact",
"typescript",
"typescriptreact"
],
"cSpell.words": [
"devarms"
]
}
48 changes: 24 additions & 24 deletions arms/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion arms/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "arms"
name = "devarms"
version = "0.1.0"
edition = "2021"
description = "Core functions for DevArms app"
repository = "https://github.com/qqhann/DevArms"
license = "MIT"

# wasm setups
[lib]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@types/node": "^16.7.13",
"@types/react": "^17.0.20",
"@types/react-dom": "^17.0.9",
"arms": "file:./arms/pkg",
"devarms": "file:./arms/pkg",
"framer-motion": "^6",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Base64.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, VStack } from '@chakra-ui/react'
import init, { base64enc, base64dec } from 'arms'
import init, { base64enc, base64dec } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Checksum.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, VStack } from '@chakra-ui/react'
import init, { sha256 } from 'arms'
import init, { sha256 } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { DropZone } from 'src/components/DropZone/DropZone'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/FormatJson.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, HStack, VStack } from '@chakra-ui/react'
import init, { format_json } from 'arms'
import init, { format_json } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsTextarea } from 'src/components/Textarea/Textarea'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Hash.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, VStack } from '@chakra-ui/react'
import init, { sha256 } from 'arms'
import init, { sha256 } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/HtmlEncDec.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, VStack } from '@chakra-ui/react'
import init, { html_decode, html_encode } from 'arms'
import init, { html_decode, html_encode } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/JsonYaml.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, HStack, VStack } from '@chakra-ui/react'
import init, { json_to_yaml } from 'arms'
import init, { json_to_yaml } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsTextarea } from 'src/components/Textarea/Textarea'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Jwt.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, VStack } from '@chakra-ui/react'
import init, { jwt_decode, DecodedJWT } from 'arms'
import init, { jwt_decode, DecodedJWT } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/LoremIpsum.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, Heading, VStack } from '@chakra-ui/react'
import init, { lorem_gen } from 'arms'
import init, { lorem_gen } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/NumberBase.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, VStack } from '@chakra-ui/react'
import init, { number_base_convert } from 'arms'
import init, { number_base_convert } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/TextCase.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, VStack } from '@chakra-ui/react'
import init, { text_case_convert, TextCase } from 'arms'
import init, { text_case_convert, TextCase } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/UrlEncDec.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Heading, VStack } from '@chakra-ui/react'
import init, { url_decode, url_encode } from 'arms'
import init, { url_decode, url_encode } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Uuid.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, Heading, VStack } from '@chakra-ui/react'
import init, { uuid_gen } from 'arms'
import init, { uuid_gen } from 'devarms'
import React, { useEffect, useState } from 'react'
import { PageLayout } from 'src/Layouts/PageLayout'
import { ArmsInput } from 'src/components/Input/Input'
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5065,9 +5065,6 @@ aria-query@^5.0.0:
resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz"
integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==

"arms@file:./arms/pkg":
version "0.1.0"

arr-diff@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
Expand Down Expand Up @@ -7025,6 +7022,9 @@ detective@^5.2.0:
defined "^1.0.0"
minimist "^1.1.1"

"devarms@file:./arms/pkg":
version "0.1.0"

didyoumean@^1.2.2:
version "1.2.2"
resolved "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz"
Expand Down

0 comments on commit f349cb9

Please sign in to comment.