Skip to content

Commit

Permalink
Merge pull request ObsidianLabs#5 from ObsidianLabs/develop
Browse files Browse the repository at this point in the history
ci: add submodule, license and minor fix
  • Loading branch information
qftgtr authored Jul 11, 2020
2 parents e3773fd + 037128c commit d8ad994
Show file tree
Hide file tree
Showing 3 changed files with 690 additions and 7 deletions.
22 changes: 15 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
yarn version --new-version ${{ steps.get_version.outputs.VERSION }}
git config --local user.email "[email protected]"
git config --local user.name "GitHub Actions"
git commit -am 'v${{ steps.get_version.outputs.VERSION }}'
git diff-index --quiet HEAD || git commit -am 'v${{ steps.get_version.outputs.VERSION }}'
- name: Push changes
uses: ad-m/github-push-action@master
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: ObsidianLabs/electron-components
ref: develop
ref: master
path: ./electron-components

- name: Build electron-components
Expand All @@ -71,7 +71,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: ObsidianLabs/substrate-components
ref: develop
ref: master
path: ./substrate-components

- name: Build substrate-components
Expand All @@ -83,6 +83,14 @@ jobs:
with:
ref: master
path: ./studio

- name: Init submodule
working-directory: ./studio
run: git submodule update --init

- name: Install submodule
working-directory: ./studio/extensions/polkadot-js
run: yarn && yarn build

- name: Build studio
uses: ObsidianLabs/studio-build-action@master
Expand All @@ -92,10 +100,10 @@ jobs:
build_script: yarn && yarn dist
working-directory: ./studio
fontawesome_token: ${{ secrets.fontawesome_token }}
mac_certs: ${{ secrets.mac_certs }}
mac_certs_password: ${{ secrets.mac_certs_password }}
windows_certs: ${{ secrets.windows_certs }}
windows_certs_password: ${{ secrets.windows_certs_password }}
mac_certs: ${{ secrets.certs }}
mac_certs_password: ${{ secrets.certs_password }}
windows_certs: ${{ secrets.certs }}
windows_certs_password: ${{ secrets.certs_password }}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload assets
Expand Down
Loading

0 comments on commit d8ad994

Please sign in to comment.