Skip to content

Commit e89713c

Browse files
committed
dep on OpenGL 0.7004, add CI even if really build-only
1 parent f537ad0 commit e89713c

File tree

3 files changed

+62
-6
lines changed

3 files changed

+62
-6
lines changed

.github/workflows/ci.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: perl
2+
on:
3+
push:
4+
branches:
5+
- '*'
6+
tags-ignore:
7+
- '*'
8+
pull_request:
9+
jobs:
10+
ci:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
os: [ubuntu-latest]
16+
perl-version: ['5.16', '5.20']
17+
include:
18+
- perl-version: '5.30'
19+
os: ubuntu-latest
20+
release-test: true
21+
coverage: true
22+
- perl-version: '5.30'
23+
os: windows-latest
24+
- perl-version: '5.30'
25+
os: macos-latest
26+
steps:
27+
- uses: actions/checkout@v2
28+
- name: 'ci-dist: target-setup-perl'
29+
uses: PDLPorters/devops/github-actions/ci-dist@master
30+
with:
31+
target-setup-perl: true
32+
perl-version: ${{ matrix.perl-version }}
33+
- name: Install pogl dependencies
34+
uses: Perl-GPU/devops/github-actions/install-dep-pogl-dep@main
35+
- name: Install PDL dependencies
36+
uses: PDLPorters/devops/github-actions/install-dep-pdl-dep@master
37+
- name: 'ci-dist: target-all'
38+
uses: Perl-GPU/devops/github-actions/ci-dist@main
39+
with:
40+
target-setup-perl: false
41+
target-install-dist-perl-deps: true
42+
build-enable-graphical-display: true
43+
dist-perl-deps-configure: OpenGL OpenGL::GLUT PDL
44+
target-test-release-testing: true
45+
target-test: true
46+
test-enable-graphical-display: true
47+
test-enable-release-testing: ${{ matrix.release-test }}
48+
test-enable-coverage: ${{ matrix.coverage }}
49+
github-token: ${{ secrets.GITHUB_TOKEN }}
50+
51+
build-status:
52+
runs-on: ubuntu-latest
53+
continue-on-error: true
54+
if: ${{ always() }}
55+
needs: [ 'ci' ]
56+
steps:
57+
- uses: PDLPorters/devops/github-actions/irc-notifications@master
58+
with:
59+
target-build-status: true
60+
needs: ${{ toJSON(needs) }}

Makefile.PL

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ WriteMakefile (
2121
CONFIGURE_REQUIRES => {
2222
'ExtUtils::MakeMaker' => 0,
2323
'PDL' => '2.096',
24-
'OpenGL' => '0.70',
25-
'OpenGL::GLUT' => '0.72',
24+
'OpenGL' => '0.7004',
2625
},
2726
PREREQ_PM => {
2827
'PDL' => '2.096',
29-
'OpenGL' => '0.70',
30-
'OpenGL::GLUT' => '0.72',
28+
'OpenGL' => '0.7004',
3129
},
3230
TEST_REQUIRES => {
3331
'Test::More' => '0.88',

OpenGLQ/Makefile.PL

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ $hash{LIBS}[0] = $OpenGL::Config->{LIBS} if $OpenGL::Config->{LIBS};
1010
$hash{DEFINE} .= ' '.$OpenGL::Config->{DEFINE} if $OpenGL::Config->{DEFINE};
1111
$hash{INC} .= ' '.$OpenGL::Config->{INC} if $OpenGL::Config->{INC};
1212
if($^O eq 'MSWin32') {
13-
$hash{LDFROM} .= ' '. $OpenGL::Config->{LDFROM};
14-
$hash{LDFROM} =~ s/\-lfreeglut//g;
1513
$hash{DEFINE} .= ' -DGLUT_DISABLE_ATEXIT_HACK'; # else get errors about PerlProc_exit on at least Strawberry Perl 5.32
1614
}
1715

0 commit comments

Comments
 (0)