diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f0265953..c3bf45a71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU for aarch64 emulation if: ${{ matrix.arch != 'x86_64' }} @@ -52,7 +52,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Lint run: io.elementary.vala-lint -d . diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index c9bd63d8b..77b2bd172 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -1,5 +1,4 @@ --- - name: Merge on: @@ -24,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU for aarch64 emulation if: ${{ matrix.arch != 'x86_64' }} @@ -52,15 +51,24 @@ jobs: gettext: name: Gettext - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 + container: + image: elementary/docker:next-unstable steps: - - name: Checkout - uses: actions/checkout@v1 # Avoid an error when pushing + - name: Install git + run: | + apt-get update + apt-get install git -y + + - name: Clone repository + uses: actions/checkout@v3 + with: + token: ${{ secrets.GIT_USER_TOKEN }} - - name: Gettext - uses: elementary/actions/gettext-template@master - env: - GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}" - GIT_USER_NAME: "elementaryBot" - GIT_USER_EMAIL: "builds@elementary.io" + - name: Update Translation Files + uses: elementary/actions/gettext-template@next + env: + GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }} + GIT_USER_NAME: "elementaryBot" + GIT_USER_EMAIL: "builds@elementary.io" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ffdd871c9..11816106c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,17 +6,17 @@ on: types: closed jobs: release: - runs-on: ubuntu-latest - if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release') - steps: - - uses: actions/checkout@v1 - - uses: elementary/actions/release@master - env: - GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}" - GIT_USER_NAME: "elementaryBot" - GIT_USER_EMAIL: "builds@elementary.io" - with: - release_branch: 'odin' + runs-on: ubuntu-latest + if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release') + steps: + - uses: actions/checkout@v3 + - uses: elementary/actions/release@master + env: + GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}" + GIT_USER_NAME: "elementaryBot" + GIT_USER_EMAIL: "builds@elementary.io" + with: + release_branch: "odin" deploy_flatpak: name: Deploy Flatpak @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up QEMU for aarch64 emulation if: ${{ matrix.arch != 'x86_64' }}