diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa2d09750..4edd357bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: branches: - master - develop + - github_actions_2 tags: pull_request: @@ -14,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-18.04] + os: [ ubuntu-18.04 ] python-version: [3.7] steps: @@ -141,24 +142,30 @@ jobs: deploy: needs: [ build, build_windows ] runs-on: ubuntu-18.04 - if: github.event_name == 'push' || 1 == 1 + if: github.event_name == 'push' || github.event_name == 'cron' steps: - uses: actions/checkout@v1 + - name: Extract branch name + shell: bash + run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" + id: extract_branch + - name: Build and test and push docker image env: IMAGE_NAME: freqtradeorg/freqtradetests DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }} # original filter # branch in (master, develop, feat/improve_travis) AND (type in (push, cron)) run: | build_helpers/publish_docker.sh - - name: Build raspberry image + - name: Build raspberry image for ${{ steps.extract_branch.outputs.branch }}_pi uses: elgohr/Publish-Docker-Github-Action@2.7 with: - name: freqtradeorg/freqtradetests:test_pi + name: freqtradeorg/freqtradetests:${{ steps.extract_branch.outputs.branch }}_pi username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} dockerfile: Dockerfile.pi diff --git a/build_helpers/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl b/build_helpers/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl new file mode 100644 index 000000000..87469a199 Binary files /dev/null and b/build_helpers/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl differ diff --git a/build_helpers/install_windows.ps1 b/build_helpers/install_windows.ps1 index e897cb88c..30427c3cc 100644 --- a/build_helpers/install_windows.ps1 +++ b/build_helpers/install_windows.ps1 @@ -1,6 +1,8 @@ -Invoke-WebRequest -Uri "https://download.lfd.uci.edu/pythonlibs/g5apjq5m/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl" -OutFile "TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl" +# Downloads don't work automatically, since the URL is regenerated via javascript. +# Downloaded from https://www.lfd.uci.edu/~gohlke/pythonlibs/#ta-lib +# Invoke-WebRequest -Uri "https://download.lfd.uci.edu/pythonlibs/xxxxxxx/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl" -OutFile "TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl" -pip install TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl +pip install build_helpers\TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl pip install -r requirements-dev.txt pip install -e . diff --git a/build_helpers/publish_docker.sh b/build_helpers/publish_docker.sh index cac2a4c04..e87047fb0 100755 --- a/build_helpers/publish_docker.sh +++ b/build_helpers/publish_docker.sh @@ -1,7 +1,7 @@ #!/bin/sh # Replace / with _ to create a valid tag -TAG=$(echo "${GITHUB_REF}" | sed -e "s/\//_/g") +TAG=$(echo "${BRANCH_NAME}" | sed -e "s/\//_/g") echo "Running for ${TAG}" # Add commit and commit_message to docker container