Skip to content

Commit 124b9d0

Browse files
authored
Upgrading ubuntu bionic to 20200639 (#1084)
* Upgrading ubuntu bionic to 20200639 * Fixing typo * Polishing GitHub workflow * Getting the correct branch name on every case * Removing branch from config
1 parent b647312 commit 124b9d0

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/build-test.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Build & test
33
on:
44
push:
55
branches:
6-
trunk
6+
- trunk
77
pull_request:
88
branches:
9-
trunk
9+
- trunk
1010

1111
jobs:
1212
build-and-test:
@@ -25,8 +25,16 @@ jobs:
2525
uses: actions/setup-python@v2
2626
with:
2727
python-version: 3.8
28-
- name: Extract branch Name
29-
run: echo "::set-env name=BRANCH::$(echo ${GITHUB_REF##*/})"
28+
- name: Get branch name (only for push to branch)
29+
if: github.event_name == 'push'
30+
run: echo "::set-env name=BRANCH::$(echo ${PUSH_BRANCH##*/})"
31+
env:
32+
PUSH_BRANCH: ${{ github.ref }}
33+
- name: Get target branch name (only for PRs)
34+
if: github.event_name == 'pull_request'
35+
run: echo "::set-env name=BRANCH::$(echo ${TARGET_BRANCH##*/})"
36+
env:
37+
TARGET_BRANCH: ${{ github.head_ref }}
3038
- name: Output branch name
3139
run: echo ${BRANCH}
3240
- name: Build Docker images

Base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:bionic-20191029
1+
FROM ubuntu:bionic-20200630
22
LABEL authors="Selenium <[email protected]>"
33

44
#================================================

0 commit comments

Comments
 (0)