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

difftreelog

fix repo name

Igor Kozyrev2021-11-22parent: #23a018e.patch.diff
in: master

5 files changed

modified.devcontainer/devcontainer.jsondiffbeforeafterboth
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,8 @@
 {
 	"name": "Rust",
     "dockerComposeFile": "./docker-compose.yml",
-    "service": "nft_private",
-    "workspaceFolder": "/workspaces/nft_private",
+    "service": "unique-chain",
+    "workspaceFolder": "/workspaces/unique-chain",
 	"settings": { 
 		"terminal.integrated.shell.linux": "/bin/bash",
 		"lldb.executable": "/usr/bin/lldb",
modified.devcontainer/docker-compose.ymldiffbeforeafterboth
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,13 +1,13 @@
 version: '3'
 services:
-  nft_private:
+  unique-chain:
     build: 
         context: .
     environment:
       - JAEGER_AGENT_HOST=jaeger
       - JAEGER_AGENT_PORT=6831
     volumes:
-      - ..:/workspaces/nft_private:cached
+      - ..:/workspaces/unique-chain:cached
       - ../../polkadot:/workspaces/polkadot:cached
       - ../../polkadot-launch:/workspaces/polkadot-launch:cached
       #- ../../frontier:/workspaces/frontier
modified.github/workflows/node_build_test.ymldiffbeforeafterboth
before · .github/workflows/node_build_test.yml
1name: Build & test23# Controls when the action will run. 4on:5 # Triggers the workflow on push or pull request events but only for the master branch6  push:7    branches: [ develop ]8 # pull_request:9 #   branches: [ develop ]10  # Allows you to run this workflow manually from the Actions tab11  workflow_dispatch:1213# A workflow run is made up of one or more jobs that can run sequentially or in parallel14jobs:15  build:16    # The type of runner that the job will run on17    runs-on: ubuntu-20.041819  #  if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true2021    # Steps represent a sequence of tasks that will be executed as part of the job22    steps:23      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it24      - uses: actions/checkout@v225          26     #runs ssh connection27      - name: Go to server28        uses: appleboy/ssh-action@master29        with:30          host: ${{ secrets.SERVER_IP }}31          username: ${{ secrets.SERVER_USERNAME }}32          key: ${{ secrets.KEY }}33          port: ${{ secrets.SERVER_PORT }}34          command_timeout: 300m35          script: |36            eval $(ssh-agent -s)37            ssh-add /home/devops/.ssh/git_hub38            git clone git@github.com:UniqueNetwork/nft_private.git39            cd nft_private40            git checkout develop41            # git pull --all42            chmod +x ci_node.sh43            ./ci_node.sh44            rm -rf /home/polkadot/nft_private
modifiedDockerfile-parachaindiffbeforeafterboth
--- a/Dockerfile-parachain
+++ b/Dockerfile-parachain
@@ -98,7 +98,7 @@
     npm install --global yarn && \
     yarn
 
-COPY --from=builder /nft_parachain/target/$PROFILE/nft /nft_private/target/$PROFILE/
+COPY --from=builder /nft_parachain/target/$PROFILE/nft /unique-chain/target/$PROFILE/
 COPY --from=builder-polkadot /nft_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/
 
 CMD export NVM_DIR="$HOME/.nvm" && \
modifiedlaunch-config.jsondiffbeforeafterboth
--- a/launch-config.json
+++ b/launch-config.json
@@ -55,7 +55,7 @@
     },
     "parachains": [
         {
-            "bin": "../nft_private/target/release/nft",
+            "bin": "../unique-chain/target/release/nft",
             "id": "2000",
             "balance": "1000000000000000000000",
             "nodes": [