Merge pull request #131 from nanasess/use-debian-archive

build-args を修正
nanasess · Sep 16, 2023 · 0b47729 · 0b47729
2 parents 5ef4289 + 14e026c
commit 0b47729
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -35,23 +35,23 @@ jobs:
           echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
           echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
           echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
-          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
       - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
           echo "APCU=" >>  ${GITHUB_ENV}
           echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
           echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
-          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
       - if: ${{ matrix.php == 7.0 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
           echo "APCU=apcu" >>  ${GITHUB_ENV}
           echo "FORCE_YES=" >>  ${GITHUB_ENV}
           echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
-          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
       - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -89,7 +89,7 @@ jobs:
       fail-fast: false
       matrix:
         db: [ 'pgsql', 'mysql' ]
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
         include:
           - db: mysql
             dbport: '3306'
@@ -112,23 +112,23 @@ jobs:
         echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
         echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
         echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
-        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
     - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=" >>  ${GITHUB_ENV}
         echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
         echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
-        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
     - if: ${{ matrix.php == 7.0 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
         echo "FORCE_YES=" >>  ${GITHUB_ENV}
         echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
-        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
     - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}