diff --git a/.github/actions/build/flutter-app/action.yaml b/.github/actions/build/flutter-app/action.yaml index 370dc11ea..44619c263 100644 --- a/.github/actions/build/flutter-app/action.yaml +++ b/.github/actions/build/flutter-app/action.yaml @@ -5,6 +5,9 @@ inputs: VERSION: description: "Version of the Flutter app" required: true + NEXT_CREDENTIALS: + description: "NEXT_CREDENTIALS" + required: true runs: using: "composite" @@ -23,21 +26,28 @@ runs: - name: Web build shell: bash - run: flutter build web + run: | + cd ./APP/ogree_app + flutter build web - - name: Windows build - shell: bash - run: flutter build windows + # - name: Windows build + # shell: bash + # run: | + # cd ./APP/ogree_app + # flutter build windows - name: Send to Nextcloud shell: bash env: - NEXT_CREDENTIALS: ${{ secrets.NEXT_CREDENTIALS }} + NEXT_CREDENTIALS: ${{ inputs.NEXT_CREDENTIALS }} NEXT_ADDR: https://nextcloud.ditrit.io/remote.php/dav/files/github.actions/Ogree/1_Core/3_APP/bin/${{ inputs.VERSION }} - run: | + run: | + cd ./APP/ogree_app + curl -u $NEXT_CREDENTIALS -X MKCOL $NEXT_ADDR + zip -r ./OGrEE_APP_Web.zip build/web/* curl -u $NEXT_CREDENTIALS -T OGrEE_APP_Web.zip $NEXT_ADDR/OGrEE_APP_Web_${{ inputs.VERSION }}.zip - Compress-Archive -Path build/windows/runner/Release/* -Destination OGrEE_APP_Win_${{ inputs.VERSION }}.zip - curl -u $env:NEXT_CREDENTIALS -T OGrEE_APP_Win.zip $env:NEXT_ADDR/OGrEE_APP_Win_${{ inputs.VERSION }}.zip + # Compress-Archive -Path build/windows/runner/Release/* -Destination OGrEE_APP_Win_${{ inputs.VERSION }}.zip + # curl -u $NEXT_CREDENTIALS -T OGrEE_APP_Win.zip $NEXT_ADDR/OGrEE_APP_Win_${{ inputs.VERSION }}.zip \ No newline at end of file diff --git a/.github/actions/build/multi-docker/action.yaml b/.github/actions/build/multi-docker/action.yaml index d4067144d..a15bc9344 100644 --- a/.github/actions/build/multi-docker/action.yaml +++ b/.github/actions/build/multi-docker/action.yaml @@ -52,13 +52,19 @@ runs: # IMAGE_NAME: "arango-api" # FOLDER_NAME: "./ARANGO_API" # VERSION: ${{ env.VERSION }} - + # TEAM_DOCKER_URL: ${{ inputs.TEAM_DOCKER_URL }} + # TEAM_USERNAME: ${{ inputs.TEAM_USERNAME }} + # TEAM_PASSWORD: ${{ inputs.TEAM_PASSWORD }} + # - name: 🐋 Build BFF # uses: ./.github/actions/build/docker # with: # IMAGE_NAME: "ogree-bff" # FOLDER_NAME: "./BFF" # VERSION: ${{ env.VERSION }} + # TEAM_DOCKER_URL: ${{ inputs.TEAM_DOCKER_URL }} + # TEAM_USERNAME: ${{ inputs.TEAM_USERNAME }} + # TEAM_PASSWORD: ${{ inputs.TEAM_PASSWORD }} - name: 🐋 Build Flutter App uses: ./.github/actions/build/docker @@ -75,6 +81,12 @@ runs: with: VERSION: ${{ env.VERSION }} NEXT_CREDENTIALS: ${{ inputs.NEXT_CREDENTIALS }} + + - name: Publish Flutter Desktop on Nexcloud + uses: ./.github/actions/build/flutter-app + with: + VERSION: ${{ env.VERSION }} + NEXT_CREDENTIALS: ${{ inputs.NEXT_CREDENTIALS }} - name: 🪣 Init Git if: ${{ !contains(inputs.ENVIRONMENT, 'Candidate') }} diff --git a/.github/workflows/versioning-release-candidate.yaml b/.github/workflows/versioning-release-candidate.yaml index 5019a24ae..ac74c8a02 100644 --- a/.github/workflows/versioning-release-candidate.yaml +++ b/.github/workflows/versioning-release-candidate.yaml @@ -31,15 +31,18 @@ jobs: run: | if [[ `git show-ref "${{ env.BRANCH_RELEASE_CANDIDATE }}" 2>/dev/null` ]]; then echo "[INFO] Branch ${{ env.BRANCH_RELEASE_CANDIDATE }} exists, deleting it" - - git config --global user.email "svc@users.noreply.github.com" - git config --global user.name "svc" - - git branch -d ${{ env.BRANCH_RELEASE_CANDIDATE }} - git push origin --delete ${{ env.BRANCH_RELEASE_CANDIDATE }} + echo "NEEDS_DELETE=true" >> $GITHUB_ENV else echo "[INFO] Branch ${{ env.BRANCH_RELEASE_CANDIDATE }} does not exist" + echo "NEEDS_DELETE=false" >> $GITHUB_ENV fi + + - name: 🗑️ Delete Release Candidate branch + if: ${{ env.NEEDS_DELETE == 'true' }} + uses: dawidd6/action-delete-branch@v3.1.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branches: ${{ env.BRANCH_RELEASE_CANDIDATE }} - name: Create Branch release candidate from main uses: peterjgrainger/action-create-branch@v2.4.0