Merge branch 'master' into enrich-analytics

iterative · Sep 28, 2022 · a612323 · a612323 · github-actions · Sep 28, 2022
2 parents fd486dd + c1bc4f5
commit a612323
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 46 deletions.
diff --git a/.github/workflows/gitlab.yml b/.github/workflows/gitlab.yml
@@ -6,8 +6,7 @@ jobs:
     services:
       gitlab:
         image: docker://gitlab/gitlab-ce
-        ports:
-          - 8000:8000
+        ports: ['8000:8000']
         env:
           GITLAB_OMNIBUS_CONFIG: |
             external_url 'http://localhost:8000/gitlab'
@@ -21,8 +20,7 @@ jobs:
               }
               '
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Configure credentials
         run: |
           docker exec ${{ job.services.gitlab.id }} bin/gitlab-rails runner "
@@ -60,8 +58,7 @@ jobs:
           --request GET \
           | jq -r .id \
           | xargs -0 printf "::set-output name=hash::%s"
-      - name: Install dependencies
-        run: npm ci
+      - run: npm ci
       - name: Run cml-send-comment
         run: |
           node bin/cml.js send-comment \

diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -1,9 +1,4 @@
-on:
-  workflow_call:
-    inputs:
-      test:
-        required: false
-        type: boolean
+on: workflow_call
 jobs:
   images:
     runs-on: ubuntu-latest
@@ -27,7 +22,7 @@ jobs:
             base: 1
             dvc: 2
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
           fetch-depth: 0
@@ -73,7 +68,7 @@ jobs:
           )"
           echo ::set-output name=tags::"${TAGS//$'\n'/'%0A'}"
       - uses: docker/setup-buildx-action@v1
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,23 +15,27 @@ jobs:
     if: github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: |
           git config --global user.name Olivaw[bot]
           git config --global user.email [email protected]
           git checkout -b bump/$(npm version ${{ github.event.inputs.bump }})
           git push --set-upstream origin --follow-tags HEAD
           gh pr create --title "Bump version to $(git describe --tags)" --body "Approve me 🤖"
-          gh pr merge --squash --auto
+          gh pr merge --auto --squash
         env:
           GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
   release:
     if: github.event.pull_request.merged && startsWith(github.head_ref, 'bump/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run:
-          gh release create --generate-notes {--title=CML\ ,}$(basename ${{
-          github.head_ref }})
+          gh release create --draft --generate-notes {--title=CML\ ,}$(basename
+          ${{ github.head_ref }})
         env:
           GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+  package:
+    needs: release
+    secrets: inherit
+    uses: ./.github/workflows/test-deploy.yml
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -1,11 +1,10 @@
 name: Test & Deploy
 on:
-  schedule:
-    - cron: '0 8 * * 1' # M H d m w (Mondays at 8:00)
-  release:
-    types: [created]
   pull_request_target:
   workflow_dispatch:
+  workflow_call:
+  schedule:
+    - cron: '0 8 * * 1' # M H d m w (Mondays at 8:00)
 jobs:
   authorize:
     environment:
@@ -22,13 +21,13 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
-      - name: check that npm lock file is on version 2
+      - name: npm lock file is v2
         run: jq --exit-status .lockfileVersion==2 < package-lock.json
   lint:
     needs: authorize
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
       - uses: actions/setup-node@v2
@@ -38,7 +37,7 @@ jobs:
     needs: authorize
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
       - uses: actions/setup-node@v2
@@ -69,7 +68,7 @@ jobs:
         system: [ubuntu, macos, windows]
     runs-on: ${{ matrix.system }}-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
       - if: matrix.system == 'windows'
@@ -91,22 +90,22 @@ jobs:
     needs: [lint, test, test-os]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
       - uses: actions/setup-node@v2
         with:
           registry-url: https://registry.npmjs.org
       - run: npm install
       - run:
-          npm ${{ github.event_name == 'release' && 'publish' || 'publish
+          npm ${{ github.event_name == 'workflow_call' && 'publish' || 'publish
           --dry-run' }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: install ldid
         run: |
           sudo apt install --yes libplist-dev
-          git clone --branch v2.1.5 git://git.saurik.com/ldid.git 
+          git clone --branch v2.1.5 git://git.saurik.com/ldid.git
           sudo g++ -pipe -o /usr/bin/ldid ldid/ldid.cpp -I. -x c ldid/{lookup2.c,sha1.h} -lplist -lcrypto
       - id: build
         name: build
@@ -121,7 +120,7 @@ jobs:
           cp build/cml-linux{-x64,}
           cp build/cml-macos{-x64,}
       - uses: softprops/action-gh-release@v1
-        if: github.event_name == 'release'
+        if: github.event_name == 'workflow_call'
         with:
           files: |
             build/cml-alpine-arm64

diff --git a/.github/workflows/trigger-external.yml b/.github/workflows/trigger-external.yml
@@ -7,24 +7,20 @@ on:
         type: string
         required: true
   release:
-    types:
-      - published
+    types: [published]
   pull_request:
-    branches:
-      - master
+    branches: [master]
 jobs:
   pr:
     if: ${{ github.event_name == 'pull_request' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        repos:
-          - cml-playground
+        repos: [cml-playground]
     steps:
       - name: Trigger external actions
         run: |
-          curl --silent --show-error \
-            --request POST \
+          curl --silent --show-error --request POST \
             --header "Authorization: token ${{ secrets.TEST_GITHUB_TOKEN }}" \
             --header "Accept: application/vnd.github.v3+json" \
             --url "https://api.github.com/repos/iterative/${{ matrix.repos }}/dispatches" \
@@ -36,13 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        repos:
-          - cml-playground
+        repos: [cml-playground]
     steps:
       - name: Trigger external actions
         run: |
-          curl --silent --show-error \
-            --request POST \
+          curl --silent --show-error --request POST \
             --header "Authorization: token ${{ secrets.TEST_GITHUB_TOKEN }}" \
             --header "Accept: application/vnd.github.v3+json" \
             --url "https://api.github.com/repos/iterative/${{ matrix.repos }}/dispatches" \

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dvcorg/cml",
-  "version": "0.17.3",
+  "version": "0.18.0",
   "description": "<p align=\"center\"> <img src=\"https://static.iterative.ai/img/cml/title_strip_trim.png\" width=400> </p>",
   "author": {
     "name": "Iterative Inc",