From bacb4a2c464ab86ba631aeb469d9945d707f7c8c Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Mon, 13 Jun 2022 18:01:13 +0100 Subject: [PATCH 1/2] checkout with head ref - fixes https://github.com/iterative/cml/issues/880 --- content/docs/cml-with-dvc.md | 12 +++++++++--- content/docs/self-hosted-runners.md | 11 ++++++++--- content/docs/start/github.md | 8 ++++++-- content/docs/usage.md | 4 +++- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/content/docs/cml-with-dvc.md b/content/docs/cml-with-dvc.md index 381396d7..34fd0429 100644 --- a/content/docs/cml-with-dvc.md +++ b/content/docs/cml-with-dvc.md @@ -17,7 +17,9 @@ jobs: runs-on: ubuntu-latest container: docker://ghcr.io/iterative/cml:0-dvc2-base1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Train model env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -121,7 +123,9 @@ Windows, Python 3 should be setup first. ```yaml steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - uses: iterative/setup-dvc@v1 ``` @@ -131,7 +135,9 @@ steps: ```yaml runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - uses: actions/setup-python@v2 with: python-version: '3.x' diff --git a/content/docs/self-hosted-runners.md b/content/docs/self-hosted-runners.md index af61f15d..5ee5c31c 100644 --- a/content/docs/self-hosted-runners.md +++ b/content/docs/self-hosted-runners.md @@ -50,7 +50,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: iterative/setup-cml@v1 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Deploy runner on EC2 env: REPO_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} @@ -70,7 +72,9 @@ jobs: image: docker://iterativeai/cml:0-dvc2-base1-gpu options: --gpus all steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Train model env: REPO_TOKEN: ${{ secrets.REPO_TOKEN }} @@ -280,8 +284,9 @@ steps: with: private-key: ${{ secrets.CML_GITHUB_APP_PEM }} app-id: ${{ secrets.CML_GITHUB_APP_ID }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: + ref: ${{ github.event.pull_request.head.sha }} token: ${{ steps.get-token.outputs.token }} - name: Train model env: diff --git a/content/docs/start/github.md b/content/docs/start/github.md index 4c12f316..b1d9a534 100644 --- a/content/docs/start/github.md +++ b/content/docs/start/github.md @@ -28,7 +28,9 @@ supported CI systems. runs-on: ubuntu-latest container: docker://ghcr.io/iterative/cml:0-dvc2-base1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Train model env: REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -137,7 +139,9 @@ Assume that we have a machine learning script, `train.py`, that outputs an image ```yaml steps: - uses: iterative/setup-cml@v1 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - env: REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | diff --git a/content/docs/usage.md b/content/docs/usage.md index 0cbe120c..72ca3ce7 100644 --- a/content/docs/usage.md +++ b/content/docs/usage.md @@ -27,7 +27,9 @@ jobs: # with: # python-version: '3.x' - uses: iterative/setup-cml@v1 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Train model run: | # Your ML workflow goes here From c61bfc8facef81b044c60634cebef9ba84e1b082 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Mon, 13 Jun 2022 18:04:16 +0100 Subject: [PATCH 2/2] update tsx too --- .../pages/Home/UseCasesSection/index.tsx | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/components/pages/Home/UseCasesSection/index.tsx b/src/components/pages/Home/UseCasesSection/index.tsx index 48550232..e5e6b4fc 100644 --- a/src/components/pages/Home/UseCasesSection/index.tsx +++ b/src/components/pages/Home/UseCasesSection/index.tsx @@ -112,7 +112,9 @@ const UseCasesSection: React.ForwardRefRenderFunction = () => (
runs-on: [ubuntu-latest]
steps:
-
- uses: actions/checkout@v2
+
- uses: actions/checkout@v3
+
with:
+
ref: {"${{ github.event.pull_request.head.sha }}"}
- uses: iterative/setup-cml@v1
@@ -202,7 +204,9 @@ const UseCasesSection: React.ForwardRefRenderFunction = () => (
runs-on: [ubuntu-latest]
steps:
-
- uses: actions/checkout@v2
+
- uses: actions/checkout@v3
+
with:
+
ref: {"${{ github.event.pull_request.head.sha }}"}
- uses: iterative/setup-cml@v1
@@ -304,7 +308,9 @@ const UseCasesSection: React.ForwardRefRenderFunction = () => (
runs-on: [ubuntu-latest]
steps:
-
- uses: actions/checkout@v2
+
- uses: actions/checkout@v3
+
with:
+
ref: {"${{ github.event.pull_request.head.sha }}"}
- uses: iterative/setup-cml@v1
@@ -409,7 +415,9 @@ const UseCasesSection: React.ForwardRefRenderFunction = () => (
deploy-runner:
runs-on: [ubuntu-latest]
steps:
-
- uses: actions/checkout@v2
+
- uses: actions/checkout@v3
+
with:
+
ref: {"${{ github.event.pull_request.head.sha }}"}
- uses: iterative/setup-cml@v1
- name: deploy
env:
@@ -433,7 +441,9 @@ const UseCasesSection: React.ForwardRefRenderFunction = () => (
steps:
-
- uses: actions/checkout@v2
+
- uses: actions/checkout@v3
+
with:
+
ref: {"${{ github.event.pull_request.head.sha }}"}
- name: "Train my model"
env:
@@ -545,7 +555,9 @@ const UseCasesSection: React.ForwardRefRenderFunction = () => (
deploy-runner:
runs-on: [ubuntu-latest]
steps:
-
- uses: actions/checkout@v2
+
- uses: actions/checkout@v3
+
with:
+
ref: {"${{ github.event.pull_request.head.sha }}"}
- uses: iterative/setup-cml@v1
- name: deploy
env:
@@ -574,7 +586,9 @@ const UseCasesSection: React.ForwardRefRenderFunction = () => (
steps:
-
- uses: actions/checkout@v2
+
- uses: actions/checkout@v3
+
with:
+
ref: {"${{ github.event.pull_request.head.sha }}"}
- uses: actions/setup-python@v2
with: