From 4fa2381ccd78f62b4adb7fd55df74b356af40011 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 22 Nov 2022 17:10:21 +0000 Subject: [PATCH 1/3] switch to self-hosted github runner --- .github/actions/common-setup/action.yml | 8 ++++---- .github/workflows/ci.yml | 18 ++++++++++++------ .github/workflows/daily-test.yml | 3 ++- .github/workflows/update-flake-lock.yml | 3 ++- .github/workflows/update-poetry-lock.yml | 3 ++- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 46433e0b..0c3ff79e 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -7,10 +7,10 @@ runs: using: "composite" steps: - - name: Installing Nix - uses: cachix/install-nix-action@v16 - with: - nix_path: nixpkgs=channel:nixpkgs-unstable + #- name: Installing Nix + # uses: cachix/install-nix-action@v16 + # with: + # nix_path: nixpkgs=channel:nixpkgs-unstable - uses: cachix/cachix-action@v10 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81ace12b..336dc4a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,8 @@ jobs: build: name: Build jupyterlab (no kernels) - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] outputs: kernels: ${{ steps.kernels.outputs.kernels }} @@ -41,7 +42,8 @@ jobs: build-kernel: name: Build ${{ matrix.kernel }} kernel needs: build - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] strategy: fail-fast: false @@ -76,7 +78,8 @@ jobs: build-all-kernels: name: Build all kernels needs: build-kernel - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v3 @@ -95,7 +98,8 @@ jobs: build-devshell: name: Build devshell needs: build-kernel - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v3 @@ -114,7 +118,8 @@ jobs: build-docs: name: Build docs needs: build-kernel - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v3 @@ -153,7 +158,8 @@ jobs: template: name: Test a template needs: build-kernel - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/daily-test.yml b/.github/workflows/daily-test.yml index 4b530927..7501019c 100644 --- a/.github/workflows/daily-test.yml +++ b/.github/workflows/daily-test.yml @@ -9,7 +9,8 @@ jobs: test-template: name: Test template - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index 6602487f..09bf9f5b 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -6,7 +6,8 @@ on: jobs: lockfile: - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/update-poetry-lock.yml b/.github/workflows/update-poetry-lock.yml index d8ca5bd1..3d4ba17b 100644 --- a/.github/workflows/update-poetry-lock.yml +++ b/.github/workflows/update-poetry-lock.yml @@ -6,7 +6,8 @@ on: jobs: poetry-update: - runs-on: ubuntu-latest + #runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] steps: - uses: actions/checkout@v3 From ca0817aadf95015a0b5edfa07c1034674af53486 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 22 Nov 2022 17:13:38 +0000 Subject: [PATCH 2/3] comment out cachix for now --- .github/actions/common-setup/action.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/common-setup/action.yml b/.github/actions/common-setup/action.yml index 0c3ff79e..e801c0aa 100644 --- a/.github/actions/common-setup/action.yml +++ b/.github/actions/common-setup/action.yml @@ -12,7 +12,7 @@ runs: # with: # nix_path: nixpkgs=channel:nixpkgs-unstable - - uses: cachix/cachix-action@v10 - with: - name: tweag-jupyter - authToken: '${{ inputs.CACHIX_AUTH_TOKEN }}' + #- uses: cachix/cachix-action@v10 + # with: + # name: tweag-jupyter + # authToken: '${{ inputs.CACHIX_AUTH_TOKEN }}' From d6534cfd8d62389c0c860abae3f4dd6b41090ce6 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 22 Nov 2022 17:15:23 +0000 Subject: [PATCH 3/3] comment out the Setup step in CI --- .github/workflows/ci.yml | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 336dc4a0..6daba8a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: with: fetch-depth: 0 - - name: Setup - uses: ./.github/actions/common-setup - with: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} + #- name: Setup + # uses: ./.github/actions/common-setup + # with: + # CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} - name: List all available kernels id: kernels @@ -55,10 +55,10 @@ jobs: with: fetch-depth: 0 - - name: Setup - uses: ./.github/actions/common-setup - with: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} + #- name: Setup + # uses: ./.github/actions/common-setup + # with: + # CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} - name: Build ${{ matrix.kernel }} kernel run: | @@ -86,10 +86,10 @@ jobs: with: fetch-depth: 0 - - name: Setup - uses: ./.github/actions/common-setup - with: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} + #- name: Setup + # uses: ./.github/actions/common-setup + # with: + # CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} - name: Build all kernels run: | @@ -106,10 +106,10 @@ jobs: with: fetch-depth: 0 - - name: Setup - uses: ./.github/actions/common-setup - with: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} + #- name: Setup + # uses: ./.github/actions/common-setup + # with: + # CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} - name: Build all kernels run: | @@ -126,10 +126,10 @@ jobs: with: fetch-depth: 0 - - name: Setup - uses: ./.github/actions/common-setup - with: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} + #- name: Setup + # uses: ./.github/actions/common-setup + # with: + # CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} - name: Build all kernels run: | @@ -167,10 +167,10 @@ jobs: path: repo fetch-depth: 0 - - name: Setup - uses: ./repo/.github/actions/common-setup - with: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} + #- name: Setup + # uses: ./repo/.github/actions/common-setup + # with: + # CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_TWEAG_JUPYTER_NIX_AUTH_TOKEN }} - name: Initialize template run: |