Skip to content

Commit 0870faf

Browse files
authored
Merge branch 'The-OpenROAD-Project:master' into pr-update-rules
2 parents 6b9e12f + 1a764f2 commit 0870faf

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

.github/workflows/github-actions-update-rules.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
steps:
13+
- name: Git prep
14+
run: |
15+
git config --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/origin/pr/*"
16+
git fetch
1317
- name: Check out repository code recursively
1418
uses: actions/checkout@v3
1519
with:

etc/DependencyInstaller.sh

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ _installUbuntuPackages() {
7171
export DEBIAN_FRONTEND="noninteractive"
7272
apt-get -y update
7373
apt-get -y install --no-install-recommends \
74+
curl \
7475
libqt5multimediawidgets5 \
7576
libqt5svg5-dev \
7677
libqt5xmlpatterns5-dev \
@@ -103,24 +104,6 @@ _installUbuntuPackages() {
103104
cd ${lastDir}
104105
rm -rf "${baseDir}"
105106
fi
106-
}
107-
108-
_installDarwinPackages() {
109-
brew install libffi tcl-tk ruby
110-
brew install python libomp
111-
brew link --force libomp
112-
brew install --cask klayout
113-
}
114-
115-
_installCI() {
116-
apt-get -y update
117-
apt-get -y install --no-install-recommends \
118-
apt-transport-https \
119-
ca-certificates \
120-
coreutils \
121-
curl \
122-
python3 \
123-
software-properties-common
124107

125108
# Add Docker's official GPG key:
126109
install -m 0755 -d /etc/apt/keyrings
@@ -138,8 +121,26 @@ _installCI() {
138121
docker-ce \
139122
docker-ce-cli \
140123
containerd.io \
141-
docker-buildx-plugin \
124+
docker-buildx-plugin
125+
}
126+
127+
_installDarwinPackages() {
128+
brew install libffi tcl-tk ruby
129+
brew install python libomp
130+
brew link --force libomp
131+
brew install --cask klayout
132+
brew install docker docker-buildx
133+
}
142134

135+
_installCI() {
136+
apt-get -y update
137+
apt-get -y install --no-install-recommends \
138+
apt-transport-https \
139+
ca-certificates \
140+
coreutils \
141+
curl \
142+
python3 \
143+
software-properties-common
143144
}
144145

145146
_help() {

0 commit comments

Comments
 (0)