Skip to content

Commit 2fb1c0d

Browse files
authored
Merge pull request #1640 from olehermanse/deptool-fixes
GH Actions: Reformatted and asciified
2 parents 541d109 + 5f7943b commit 2fb1c0d

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

.github/workflows/build-using-buildscripts.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ jobs:
108108
109109
- name: Build package in docker
110110
env:
111-
GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE: ${{ secrets.GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE }}
111+
GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE: ${{ secrets.GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE }}
112112
run: |
113-
if [ ! -f packages/cfe*deb ]; then
114-
buildscripts/ci/docker-build-package.sh
115-
fi
113+
if [ ! -f packages/cfe*deb ]; then
114+
buildscripts/ci/docker-build-package.sh
115+
fi
116116
117117
- name: Save dependency cache
118118
uses: actions/cache/save@v3

.github/workflows/deployment-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ jobs:
111111
- name: Build package in docker
112112
id: build_package
113113
env:
114-
GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE: ${{ secrets.GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE }}
114+
GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE: ${{ secrets.GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE }}
115115
run: |
116-
if [ ! -f packages/cfe*deb ]; then
117-
buildscripts/ci/docker-build-package.sh
118-
fi
116+
if [ ! -f packages/cfe*deb ]; then
117+
buildscripts/ci/docker-build-package.sh
118+
fi
119119
120120
- name: Run deployment tests
121121
run: buildscripts/ci/docker-deployment-tests.sh

.github/workflows/update-deps.yml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,48 @@ on:
44
schedule:
55
- cron: "0 7 * * 1" # Run every Monday at 7am UTC
66
# | | | | |
7-
# | | | | day of the week (06) (Sunday to Saturday)
8-
# | | | month (112)
9-
# | | day of the month (131)
10-
# | hour (023)
11-
# minute (059)
7+
# | | | | day of the week (0-6) (Sunday to Saturday)
8+
# | | | month (1-12)
9+
# | | day of the month (1-31)
10+
# | hour (0-23)
11+
# minute (0-59)
1212
workflow_dispatch: # Enables manual trigger
1313

1414
jobs:
1515
update_dependencies:
1616
name: Update dependencies
1717
runs-on: ubuntu-latest
1818
steps:
19-
- name: Checks-out repository
20-
uses: actions/checkout@v4
21-
- name: Set up Python 3.12
22-
uses: actions/setup-python@v5
23-
with:
24-
python-version: "3.12"
25-
- name: Install dependencies
26-
run: |
27-
python -m pip install --upgrade pip
28-
python -m pip install requests
29-
- name: Set Git user
30-
run: |
31-
git config user.name 'GitHub'
32-
git config user.email '<noreply@github.com>'
33-
- name: Run update script
34-
run: python3 .github/workflows/update-deps.py --debug --bump=major
35-
- name: Check if commits were made
36-
run: |
37-
if [[ $(git log --oneline -1 --author="GitHub") ]]; then
38-
echo "COMMIT_MADE=true" >> $GITHUB_ENV
39-
fi
40-
- name: Create Pull Request
41-
if: env.COMMIT_MADE == 'true'
42-
uses: cfengine/create-pull-request@v6
43-
with:
44-
title: Updated dependencies
45-
body: Automated dependency updates
46-
reviewers: |
47-
olehermanse
48-
larsewi
49-
craigcomstock
50-
branch: update-dependencies-action
51-
branch-suffix: timestamp
19+
- name: Checks-out repository
20+
uses: actions/checkout@v4
21+
- name: Set up Python 3.12
22+
uses: actions/setup-python@v5
23+
with:
24+
python-version: "3.12"
25+
- name: Install dependencies
26+
run: |
27+
python -m pip install --upgrade pip
28+
python -m pip install requests
29+
- name: Set Git user
30+
run: |
31+
git config user.name 'GitHub'
32+
git config user.email '<noreply@github.com>'
33+
- name: Run update script
34+
run: python3 .github/workflows/update-deps.py --debug --bump=major
35+
- name: Check if commits were made
36+
run: |
37+
if [[ $(git log --oneline -1 --author="GitHub") ]]; then
38+
echo "COMMIT_MADE=true" >> $GITHUB_ENV
39+
fi
40+
- name: Create Pull Request
41+
if: env.COMMIT_MADE == 'true'
42+
uses: cfengine/create-pull-request@v6
43+
with:
44+
title: Updated dependencies
45+
body: Automated dependency updates
46+
reviewers: |
47+
olehermanse
48+
larsewi
49+
craigcomstock
50+
branch: update-dependencies-action
51+
branch-suffix: timestamp

0 commit comments

Comments
 (0)