Skip to content

Commit

Permalink
merged main
Browse files Browse the repository at this point in the history
  • Loading branch information
tmbo committed Sep 21, 2023
2 parents 87e2858 + 3f51e5e commit 28edf5c
Show file tree
Hide file tree
Showing 33 changed files with 458 additions and 1,435 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/continous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ jobs:
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@ecf95283f03858871ff00b787d79c419715afc34 # v2.7.0
uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2.7.0

- name: Read Poetry Version 🔢
run: |
Expand Down Expand Up @@ -906,7 +906,7 @@ jobs:
# Base MITIE image
BASE_MITIE_IMAGE_HASH=${{ hashFiles('docker/Dockerfile.base-mitie') }}
MAKEFILE_MITIE_HASH=${{ hashFiles('Makefile') }}
echo "base_mitie_image_hash=${BASE_MITIE_IMAGE_HASH:0:50}-${MAKEFILE_MITIE_HASH:0:50}" >> $GITHUB_OUTPUT
echo "base_mitie_image_hash=${BASE_MITIE_IMAGE_HASH}" >> $GITHUB_OUTPUT
BASE_IMAGE_MITIE_EXISTS=$((docker manifest inspect rasa/rasa:base-mitie-${BASE_MITIE_IMAGE_HASH:0:50}-${MAKEFILE_MITIE_HASH:0:50} &> /dev/null && echo true || echo false) || true)
echo "base_mitie_exists=${BASE_IMAGE_MITIE_EXISTS}" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -1046,7 +1046,7 @@ jobs:
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@ecf95283f03858871ff00b787d79c419715afc34 # v2.7.0
uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2.7.0

- name: Free disk space
if: needs.changes.outputs.docker == 'true'
Expand Down Expand Up @@ -1095,8 +1095,6 @@ jobs:
IS_NEWEST_VERSION=${{ needs.build_docker_base_images_and_set_env.outputs.is_newest_version }}
docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --push
docker buildx bake --set *.platform=linux/amd64 -f docker/docker-bake.hcl ${{ matrix.image }} --load
docker buildx bake --set *.platform=linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --load
# Tag the image as latest
if [[ "${IS_NEWEST_VERSION}" == "true" ]]; then
Expand All @@ -1107,9 +1105,11 @@ jobs:
fi
LATEST_TAG=$(echo $RELEASE_TAG | sed 's/'$IMAGE_TAG'/latest/g')
docker tag rasa/rasa:${RELEASE_TAG} rasa/rasa:${LATEST_TAG}
docker push rasa/rasa:${LATEST_TAG}
# This will not build the image from ground up, but will only tag the existing image with LATEST_TAG
IMAGE_TAG=${LATEST_TAG} docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }}
# Push tagged image
IMAGE_TAG=${LATEST_TAG} docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --push
fi
deploy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
shell: bash

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c
uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55
id: buildx
with:
version: v0.5.1
Expand Down
4 changes: 4 additions & 0 deletions 3.7.0b1/main_plain/.config/rasa/global.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
metrics:
enabled: true
rasa_user_id: 003ff8fbd6e04031b5597b37356022d4
date: 2023-09-12 13:20:59.423434
7 changes: 7 additions & 0 deletions CHANGELOG.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->

<!-- TOWNCRIER -->

## [3.6.8] - 2023-08-30

Rasa 3.6.8 (2023-08-30)

No significant changes.


## [3.6.7] - 2023-08-29

Rasa 3.6.7 (2023-08-29)
Expand Down
1 change: 1 addition & 0 deletions changelog/12790.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed `KeyError` which resulted when `domain_responses` doesn't exist as a keyword argument while using a custom action dispatcher with nlg server.
1 change: 1 addition & 0 deletions changelog/1493.improvement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Telemetry data is only send for licensed users.
15 changes: 1 addition & 14 deletions docs/docs/installation/installing-rasa-open-source.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,6 @@ import Tabs from "@theme/Tabs";
import TabItem from "@theme/TabItem";
import { Button } from "@theme/Button";

:::note Want to explore first?
You can explore Rasa Open Source online using the Rasa Playground even before you install it.
At the end of the tutorial, you can download the resulting assistant, install Rasa on
your machine and continue development locally.

<a
className="button button--outline button button"
href={useBaseUrl("/playground")}
>
Rasa Playground
</a>
:::

## Install Rasa Open Source

<Tabs values={[{"label": "Ubuntu / macOS / Windows", "value": "ubuntu/macos/windows"}]} defaultValue="ubuntu/macos/windows">
Expand Down Expand Up @@ -147,7 +134,7 @@ python3 -m spacy download en_core_web_md

:::tip Using `zsh`?

In zsh, square brackets are interpreted as patterns on the command line.
In zsh, square brackets are interpreted as patterns on the command line.
To run commands with square brackets, you can either enclose the arguments
with square brackets in quotes, like `pip3 install 'rasa[spacy]'`, or escape
the square brackets using backslashes, like `pip3 install rasa\[spacy\]`.
Expand Down
267 changes: 0 additions & 267 deletions docs/docs/playground.mdx

This file was deleted.

1 change: 0 additions & 1 deletion docs/docs/setting-up-ci-cd.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ jobs:
- name: Rasa Train and Test GitHub Action
uses: RasaHQ/rasa-train-test-gha@main
with:
requirements_file: requirements.txt
data_validate: true
rasa_train: true
cross_validation: true
Expand Down
Loading

0 comments on commit 28edf5c

Please sign in to comment.