diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 911e632..46be282 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -11,39 +11,6 @@ on: jobs: - refresh-modules: - name: Refresh Submodules - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token - fetch-depth: 0 # otherwise, you will failed to push refs to dest repo - - - name: Create local changes - run: | - #git pull --recurse-submodules - #git submodule update --remote --recursive - git submodule update --init --recursive - git submodule update --recursive --remote - - - name: Commit files - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - git commit -m "Update Submodules" -a - - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch - - - name: Push changes - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ steps.extract_branch.outputs.branch }} #${{ github.ref }} - generate-version: name: Generate version runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d6f60f..9fb15ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,8 +7,35 @@ on: jobs: + refresh-modules: + name: Refresh Submodules + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token + fetch-depth: 0 # otherwise, you will failed to push refs to dest repo + + - name: Create local changes + run: | + git submodule update --init --recursive + git submodule update --recursive --remote + + - name: Commit files + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + git commit -m "New Release: Update Submodules" -a + + - name: Push changes + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: main + generate-version: + name: Generate version runs-on: ubuntu-latest outputs: @@ -34,7 +61,8 @@ jobs: git-release: - needs: ["generate-version"] + name: Git Release + needs: ["generate-version", "refresh-modules"] runs-on: ubuntu-latest steps: