From a7b04620ab3fb3db5eee82d36212e246a3c19369 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 14 Sep 2020 13:02:03 +0200 Subject: [PATCH] Update main.yml --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d21c5c096..1cea7b655 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,8 +29,8 @@ jobs: REPO_URL: https://github.com/ysurac/openmptcprouter SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }} run: | - git clone --depth 1 $REPO_URL openmptcprouter - cd openmptcprouter + git clone --depth 1 $REPO_URL omr + cd omr if [ "$SOURCE_NAME" != "Test-Github-Actions" ] && [ "$SOURCE_NAME" != "develop" ]; then git checkout master else @@ -38,7 +38,7 @@ jobs: fi git pull - name: Build toolchain - working-directory: ./openmptcprouter + working-directory: ./omr env: OMR_FEED_URL: https://github.com/ysurac/openmptcprouter-feeds SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }} @@ -48,13 +48,13 @@ jobs: #echo -e "${{ secrets.OMR_PRIVKEY }}" > $OMR_TARGET/source/key-build #echo -e "${{ secrets.OMR_PUBKEY }}" > $OMR_TARGET/source/key-build.pub - name: Build packages - working-directory: ./openmptcprouter + working-directory: ./omr env: OMR_TARGET: ${{ matrix.OMR_TARGET }} run: | make IGNORE_ERRORS=m -C $OMR_TARGET/source package/{compile,install,index} -j$(nproc) || make IGNORE_ERRORS=m -C $OMR_TARGET/source package/{compile,install,index} -j1 V=s - name: Build image - working-directory: ./openmptcprouter + working-directory: ./omr env: OMR_TARGET: ${{ matrix.OMR_TARGET }} run: | @@ -63,7 +63,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${{ matrix.OMR_TARGET }} - path: ./openmptcprouter/${{ matrix.OMR_TARGET }}/source/bin + path: ./omr/${{ matrix.OMR_TARGET }}/source/bin - if: steps.branch_name.outputs.SOURCE_BRANCH == '' name: Deploy - Create directory uses: fifsky/ssh-action@master @@ -98,7 +98,7 @@ jobs: with: switches: -av --delete-after remote_path: deploy/release/${{env.SOURCE_TAG}}/${{matrix.OMR_TARGET}} - path: ./openmptcprouter/${{matrix.OMR_TARGET}}/source/bin/ + path: ./omr/${{matrix.OMR_TARGET}}/source/bin/ remote_key: ${{ secrets.PRIVATE_KEY }} remote_user: deploy remote_host: ${{ secrets.OMR_DEPLOY_HOST }} @@ -113,7 +113,7 @@ jobs: with: switches: -av --delete-after remote_path: deploy/${{env.SOURCE_BRANCH}}/${{env.OMR_KERNEL}}/${{matrix.OMR_TARGET}} - path: ./openmptcprouter/${{matrix.OMR_TARGET}}/source/bin/ + path: ./omr/${{matrix.OMR_TARGET}}/source/bin/ remote_key: ${{ secrets.PRIVATE_KEY }} remote_user: deploy remote_host: ${{ secrets.OMR_DEPLOY_HOST }}