Skip to content

Commit

Permalink
Merge pull request chef#1019 from chef/fixup-201803
Browse files Browse the repository at this point in the history
Fixing ubuntu builds, update builds.yml
  • Loading branch information
Seth Thomas authored Mar 25, 2018
2 parents f9b8bbb + 1b32984 commit 4f1a654
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public:
- 'ubuntu-16.04-i386'
- 'ubuntu-14.04'
- 'ubuntu-14.04-i386'
- 'debian-9.3'
- 'debian-9.3-i386'
- 'debian-9.4'
- 'debian-9.4-i386'
- 'debian-8.10'
- 'debian-8.10-i386'
- 'debian-7.11'
Expand All @@ -36,7 +36,7 @@ public:
slugs:
'centos-7': 'centos-7.4'
'centos-6': 'centos-6.9'
'debian-9': 'debian-9.3'
'debian-9': 'debian-9.4'
'debian-8': 'debian-8.10'
'debian-7': 'debian-7.11'
'freebsd-11': 'freebsd-11.1'
Expand Down
2 changes: 1 addition & 1 deletion ubuntu/scripts/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
export DEBIAN_FRONTEND=noninteractive

ubuntu_version="`lsb_release -r | awk '{print $2}'`";
ubuntu_major_version="`echo $ubuntu_version | awk -F. '{print $1}'`";
major_version="`echo $ubuntu_version | awk -F. '{print $1}'`";

# Disable release-upgrades
sed -i.bak 's/^Prompt=.*$/Prompt=never/' /etc/update-manager/release-upgrades;
Expand Down

0 comments on commit 4f1a654

Please sign in to comment.