Skip to content

Commit ac89ad3

Browse files
committed
nextpnr: Add pkg images
WIP nextpnr add missing pkg-all WIP add dockerTestPkg nextpnr WIP fix nextpnr pkgs WIP add nextpnr pkg tests WIP fix nextpnr pkg test script file perm
1 parent 6639612 commit ac89ad3

File tree

5 files changed

+121
-0
lines changed

5 files changed

+121
-0
lines changed

.github/workflows/nextpnr.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,16 @@ jobs:
4545

4646
- run: dockerBuild nextpnr:ice40 nextpnr ice40
4747
- run: dockerBuild nextpnr:icestorm nextpnr icestorm
48+
- run: dockerBuild pkg:nextpnr-ice40 nextpnr pkg-ice40
4849
- run: dockerBuild nextpnr:ecp5 nextpnr ecp5
4950
- run: dockerBuild nextpnr:prjtrellis nextpnr prjtrellis
51+
- run: dockerBuild pkg:nextpnr-ecp5 nextpnr pkg-ecp5
52+
- run: dockerBuild pkg:nextpnr-all nextpnr pkg-all
5053
- run: dockerBuild nextpnr nextpnr
5154

55+
- run: dockerTestPkg nextpnr-ice40
56+
- run: dockerTestPkg nextpnr-ecp5
57+
- run: dockerTestPkg nextpnr-all
5258
- run: dockerTest nextpnr:ice40
5359
- run: dockerTest nextpnr:icestorm
5460
- run: dockerTest nextpnr:ecp5
@@ -68,11 +74,20 @@ jobs:
6874
- run: dockerPush nextpnr:icestorm
6975
if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
7076

77+
- run: dockerPush pkg:nextpnr-ice40
78+
if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
79+
7180
- run: dockerPush nextpnr:ecp5
7281
if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
7382

7483
- run: dockerPush nextpnr:prjtrellis
7584
if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
7685

86+
- run: dockerPush pkg:nextpnr-ecp5
87+
if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
88+
7789
- run: dockerPush nextpnr
7890
if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'
91+
92+
- run: dockerPush pkg:nextpnr-all
93+
if: github.event_name != 'pull_request' && github.repository == 'hdl/containers'

nextpnr.dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ COPY --from=hdlc/pkg:icestorm /icestorm /
7171

7272
#---
7373

74+
FROM scratch AS pkg-ice40
75+
COPY --from=build-ice40 /opt/nextpnr /nextpnr-ice40
76+
77+
#---
78+
7479
FROM build-gitfetch AS build-ecp5
7580
COPY --from=hdlc/pkg:prjtrellis /prjtrellis /
7681

@@ -95,6 +100,11 @@ COPY --from=hdlc/pkg:prjtrellis /prjtrellis /
95100

96101
#---
97102

103+
FROM scratch AS pkg-ecp5
104+
COPY --from=build-ecp5 /opt/nextpnr /nextpnr-ecp5
105+
106+
#---
107+
98108
FROM build-ice40 AS build-all
99109
COPY --from=hdlc/pkg:prjtrellis /prjtrellis /
100110

@@ -109,5 +119,10 @@ RUN cd /tmp/nextpnr/build \
109119

110120
#---
111121

122+
FROM scratch AS pkg-all
123+
COPY --from=build-all /opt/nextpnr /nextpnr-all
124+
125+
#---
126+
112127
FROM base AS all
113128
COPY --from=build-all /opt/nextpnr /

test/nextpnr-all.pkg.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/sh
2+
3+
# Authors:
4+
# Sebastian Birke
5+
#
6+
# Copyright 2020-2021 Unai Martinez-Corral <[email protected]>
7+
# Copyright 2020-2021 Sebastian Birke <[email protected]>
8+
#
9+
# Licensed under the Apache License, Version 2.0 (the "License");
10+
# you may not use this file except in compliance with the License.
11+
# You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS,
17+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
# See the License for the specific language governing permissions and
19+
# limitations under the License.
20+
#
21+
# SPDX-License-Identifier: Apache-2.0
22+
23+
set -e
24+
25+
cd $(dirname "$0")
26+
27+
./_tree.sh
28+
29+
./_todo.sh

test/nextpnr-ecp5.pkg.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/sh
2+
3+
# Authors:
4+
# Sebastian Birke
5+
#
6+
# Copyright 2020-2021 Unai Martinez-Corral <[email protected]>
7+
# Copyright 2020-2021 Sebastian Birke <[email protected]>
8+
#
9+
# Licensed under the Apache License, Version 2.0 (the "License");
10+
# you may not use this file except in compliance with the License.
11+
# You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS,
17+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
# See the License for the specific language governing permissions and
19+
# limitations under the License.
20+
#
21+
# SPDX-License-Identifier: Apache-2.0
22+
23+
set -e
24+
25+
cd $(dirname "$0")
26+
27+
./_tree.sh
28+
29+
file /usr/local/bin/nextpnr-ecp5
30+
31+
./_todo.sh

test/nextpnr-ice40.pkg.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/sh
2+
3+
# Authors:
4+
# Sebastian Birke
5+
#
6+
# Copyright 2020-2021 Unai Martinez-Corral <[email protected]>
7+
# Copyright 2020-2021 Sebastian Birke <[email protected]>
8+
#
9+
# Licensed under the Apache License, Version 2.0 (the "License");
10+
# you may not use this file except in compliance with the License.
11+
# You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS,
17+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
# See the License for the specific language governing permissions and
19+
# limitations under the License.
20+
#
21+
# SPDX-License-Identifier: Apache-2.0
22+
23+
set -e
24+
25+
cd $(dirname "$0")
26+
27+
./_tree.sh
28+
29+
file /usr/local/bin/nextpnr-ice40
30+
31+
./_todo.sh

0 commit comments

Comments
 (0)