From 17f426a3f3082a2e68a1bbbd0b69fea9ce8edb93 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sun, 8 Jan 2023 19:08:06 +0100 Subject: [PATCH 1/2] actions/checkout@v3 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/gettext.yml | 12 ++++++------ .github/workflows/release.yml | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b0315b64..7c4c5d5e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: image: elementary/docker:odin-unstable steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Dependencies run: | apt update @@ -32,6 +32,6 @@ jobs: image: valalang/lint steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Lint run: io.elementary.vala-lint -d . diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml index c138b0da7..529b916f3 100644 --- a/.github/workflows/gettext.yml +++ b/.github/workflows/gettext.yml @@ -6,9 +6,9 @@ jobs: gettext_template: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: elementary/actions/gettext-template@master - env: - GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}" - GIT_USER_NAME: "elementaryBot" - GIT_USER_EMAIL: "builds@elementary.io" + - uses: actions/checkout@v3 + - uses: elementary/actions/gettext-template@master + 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 2da57af03..1146f5a4f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,14 +6,14 @@ 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: 'horus' + 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: "horus" From 51e488b297ac940b81d26340e1cddfe6a5f4bd9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 11 Jan 2023 09:53:35 -0800 Subject: [PATCH 2/2] Update gettext.yml --- .github/workflows/gettext.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml index 529b916f3..ef0219ac3 100644 --- a/.github/workflows/gettext.yml +++ b/.github/workflows/gettext.yml @@ -1,14 +1,29 @@ name: Gettext Updates + on: push: branches: master + jobs: - gettext_template: - runs-on: ubuntu-latest + build: + runs-on: ubuntu-22.04 + container: + image: elementary/docker:next-unstable + steps: - - uses: actions/checkout@v3 - - 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: 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: 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"