Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feat/v2.0.0' into feat/feat-dele…
Browse files Browse the repository at this point in the history
…te-records
  • Loading branch information
sdiazlor committed Jun 12, 2024
2 parents dbc27b5 + aa2cbe6 commit 6fe9279
Show file tree
Hide file tree
Showing 218 changed files with 1,363 additions and 2,882 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/argilla-sdk.docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,28 @@ jobs:
git config --global user.name "${{ github.actor }}"
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
- name: Print GitHub ref info
run:
echo "${{ github.ref }}"
echo "${{ github.head_ref }}"

- run: pdm run mike deploy dev --push
if: github.ref == 'refs/heads/feat/v2.0.0'
# if: github.ref == 'refs/heads/develop'
env:
GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}

- run: pdm run mike deploy ${{ github.ref_name }} latest --update-aliases --push
if: startsWith(github.ref, 'refs/tags/')
env:
GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}

- name: Extract branch name
shell: bash
run: echo "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" | sed 's/\//_/g' >> $GITHUB_OUTPUT
id: extract_branch_name

- run: pdm run mike deploy ${{ steps.extract_branch_name.outputs.branch_name }} --push
if: startsWith(github.head_ref, 'docs/')
if: startsWith(github.ref, 'refs/heads/docs') || startsWith(github.head_ref, 'docs/')
env:
GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
3 changes: 2 additions & 1 deletion .github/workflows/argilla-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
branches:
- "develop"
- "main"
- "feat/**"

pull_request:
paths:
Expand Down Expand Up @@ -55,7 +56,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v4
- name: Setup PDM
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/argilla-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ on:
branches:
- main
- develop
- "feat/**"
- releases/**

pull_request:
paths:
- argilla-server/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/argilla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
branches:
- main
- develop
- "feat/**"
- releases/**

pull_request:
Expand All @@ -31,7 +32,6 @@ on:
- "published"

jobs:

run_unit_tests:
name: Run unit tests
uses: ./.github/workflows/argilla.run-python-tests.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,6 @@
margin: 0 auto;
padding: 4em;
}
%collapsable-if-metrics {
padding-right: calc($sidebarMenuWidth + 56px);
transition: padding 0.25s linear 0.2s;
.--metrics & {
@include media(">desktop") {
padding-right: calc($sidebarWidth + 25px);
transition: padding 0.25s linear;
}
}
}

%clear {
@include font-size(13px);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,7 @@ $swift-linear-timing-function: linear !default;
$swift-linear: all $swift-linear-duration $swift-linear-timing-function !default;

// topbar
$topbarHeight: 56px;

// sidebar
$sidebarPanelWidth: 280px;
$sidebarMenuWidth: 70px;
$sidebarWidth: $sidebarPanelWidth + $sidebarMenuWidth;
$topbarHeight: $base-space * 7;

// record
$record-reference-border-color: palette(apricot, dark);
Expand Down

This file was deleted.

Loading

0 comments on commit 6fe9279

Please sign in to comment.