diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8ca12c6d..9c45047b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -135,7 +135,7 @@ jobs: dockerfile: Dockerfile - name: Login to Github Container Registry - if: ${{ github.ref_name == 'develop' && || startsWith(github.ref, 'refs/tags/v') }} + if: ${{ github.ref_name == 'develop' || startsWith(github.ref, 'refs/tags/v') }} uses: docker/login-action@v2 with: registry: "ghcr.io" @@ -143,7 +143,7 @@ jobs: password: ${{ github.token }} - name: Build and Push to ghcr - if: ${{ github.ref_name == 'develop' && || startsWith(github.ref, 'refs/tags/v') }} + if: ${{ github.ref_name == 'develop' || startsWith(github.ref, 'refs/tags/v') }} uses: docker/build-push-action@v3 id: build_push_ghcr with: @@ -254,41 +254,8 @@ jobs: contents: 'read' id-token: 'write' packages: 'write' - name: Publish + name: Publish_prod steps: -# - uses: actions/checkout@v3 -# with: -# fetch-depth: 0 -# - name: 'Get Previous tag' -# id: previoustag -# uses: "WyriHaximus/github-action-get-previous-tag@v1" -# with: -# fallback: 0.0.0 -# -# - name: Set up Ruby 3.1.4 -# uses: actions/setup-ruby@v1 -# with: -# ruby-version: 3.1.4 -# - run: | -# gem install --no-document fpm -# fpm -h -# - name: Install package_Cloud -# run: | -# gem install package_cloud -# package_cloud -h -# - name: get gradle version -# shell: bash -# id: version -# run: echo "version=$(./gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}')" >> "${GITHUB_OUTPUT}" -# - name: get package version -# shell: bash -# id: pkg_version -# run: | -# if [[ ${{ github.ref_name }} =~ ^v.* ]] ; then -# echo "version=${{ steps.version.outputs.version }}" >> "${GITHUB_OUTPUT}" -# else -# echo "version=${{ steps.version.outputs.version }}-${{ github.run_number }}" >> "${GITHUB_OUTPUT}" -# fi - run: echo ${{needs.Publish_dev.outputs.version}} - name : Test if: startsWith(github.ref, 'refs/tags/v')