From c39fd49b1f64279994be36000ceecee1fb2d9534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Tue, 17 Oct 2023 22:47:17 +0200 Subject: [PATCH] Remove commented out leftovers --- .github/workflows/ci-binary-checker.yml | 10 +++++----- .github/workflows/ci-build-upload-binaries.yml | 3 --- .github/workflows/ci-build.yml | 3 --- .github/workflows/ci-nym-connect-desktop-rust.yml | 2 -- .github/workflows/ci-nym-wallet-rust.yml | 2 -- .github/workflows/ci-nym-wallet-storybook.yml | 13 ++++++++++++- .github/workflows/ci-sdk-wasm.yml | 3 +-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-binary-checker.yml b/.github/workflows/ci-binary-checker.yml index 86e4903be2..ec08504816 100644 --- a/.github/workflows/ci-binary-checker.yml +++ b/.github/workflows/ci-binary-checker.yml @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: platform: [custom-linux] - + runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v3 @@ -45,12 +45,12 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable - + - name: Branch name run: echo running on branch ${GITHUB_REF##*/} - + - name: Run tests against binaries run: ./build_and_run.sh ${{ github.head_ref || github.ref_name }} working-directory: tests/ - - + + diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml index d3a84b7600..559bac5295 100644 --- a/.github/workflows/ci-build-upload-binaries.yml +++ b/.github/workflows/ci-build-upload-binaries.yml @@ -31,9 +31,6 @@ on: - 'tools/nym-cli/**' - 'tools/ts-rs-cli/**' -env: - NETWORK: mainnet - jobs: publish-nym: strategy: diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4ad027637f..aa95bd7763 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -48,9 +48,6 @@ jobs: runs-on: ${{ matrix.os }} env: CARGO_TERM_COLOR: always - # Enable sccache via environment variable - # env: - # RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler diff --git a/.github/workflows/ci-nym-connect-desktop-rust.yml b/.github/workflows/ci-nym-connect-desktop-rust.yml index 0eea154550..9edb08d4a9 100644 --- a/.github/workflows/ci-nym-connect-desktop-rust.yml +++ b/.github/workflows/ci-nym-connect-desktop-rust.yml @@ -27,8 +27,6 @@ jobs: runs-on: [self-hosted, custom-linux] env: CARGO_TERM_COLOR: always - # env: - # RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libayatana-appindicator3-dev diff --git a/.github/workflows/ci-nym-wallet-rust.yml b/.github/workflows/ci-nym-wallet-rust.yml index 8d95a534c4..8f865195e7 100644 --- a/.github/workflows/ci-nym-wallet-rust.yml +++ b/.github/workflows/ci-nym-wallet-rust.yml @@ -19,8 +19,6 @@ jobs: runs-on: [ self-hosted, custom-linux ] env: CARGO_TERM_COLOR: always - # env: - # RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools diff --git a/.github/workflows/ci-nym-wallet-storybook.yml b/.github/workflows/ci-nym-wallet-storybook.yml index 7b17b2a741..a252cd1359 100644 --- a/.github/workflows/ci-nym-wallet-storybook.yml +++ b/.github/workflows/ci-nym-wallet-storybook.yml @@ -10,26 +10,35 @@ jobs: runs-on: custom-linux steps: - uses: actions/checkout@v2 + - name: Install rsync run: sudo apt-get install rsync continue-on-error: true + - uses: rlespinasse/github-slug-action@v3.x + - uses: actions/setup-node@v3 with: node-version: 18 + - name: Setup yarn run: npm install -g yarn + - name: Install Rust stable uses: actions-rs/toolchain@v1 with: toolchain: stable + - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + - name: Build dependencies run: yarn && yarn build + - name: Build storybook run: yarn storybook:build working-directory: ./nym-wallet + - name: Deploy branch to CI www (storybook) continue-on-error: true uses: easingthemes/ssh-deploy@main @@ -41,9 +50,11 @@ jobs: REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }} TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/wallet-${{ env.GITHUB_REF_SLUG }} EXCLUDE: "/dist/, /node_modules/" + - name: Matrix - Node Install run: npm install working-directory: .github/workflows/support-files + - name: Matrix - Send Notification env: NYM_NOTIFICATION_KIND: nym-wallet diff --git a/.github/workflows/ci-sdk-wasm.yml b/.github/workflows/ci-sdk-wasm.yml index 4cd34ece69..bbcc31246e 100644 --- a/.github/workflows/ci-sdk-wasm.yml +++ b/.github/workflows/ci-sdk-wasm.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 - + - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -32,7 +32,6 @@ jobs: with: go-version: '1.20' - - name: Install wasm-pack run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh