Skip to content

Commit

Permalink
Merge pull request #37 from infosiftr/1.3
Browse files Browse the repository at this point in the history
Update to 1.3.0 GA
  • Loading branch information
yosifkit authored Nov 26, 2019
2 parents 907f7eb + efa4450 commit 25dd704
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 262 deletions.
4 changes: 1 addition & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ image: Visual Studio 2017

environment:
matrix:
- version: 1.3-rc
variant: windowsservercore-ltsc2016
- version: 1.2
- version: 1.3
variant: windowsservercore-ltsc2016
- version: 1.0
variant: windowsservercore-ltsc2016
Expand Down
21 changes: 5 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,16 @@ services: docker
matrix:
include:
- os: linux
env: VERSION=1.3-rc VARIANT=buster ARCH=
env: VERSION=1.3 VARIANT=buster ARCH=
- os: linux
env: VERSION=1.3-rc VARIANT=buster ARCH=i386
env: VERSION=1.3 VARIANT=buster ARCH=i386
- os: linux
env: VERSION=1.3-rc VARIANT=stretch ARCH=
env: VERSION=1.3 VARIANT=stretch ARCH=
- os: linux
env: VERSION=1.3-rc VARIANT=stretch ARCH=i386
env: VERSION=1.3 VARIANT=stretch ARCH=i386
- os: windows
dist: 1803-containers
env: VERSION=1.3-rc VARIANT=windows/windowsservercore-1803
- os: linux
env: VERSION=1.2 VARIANT=buster ARCH=
- os: linux
env: VERSION=1.2 VARIANT=buster ARCH=i386
- os: linux
env: VERSION=1.2 VARIANT=stretch ARCH=
- os: linux
env: VERSION=1.2 VARIANT=stretch ARCH=i386
- os: windows
dist: 1803-containers
env: VERSION=1.2 VARIANT=windows/windowsservercore-1803
env: VERSION=1.3 VARIANT=windows/windowsservercore-1803
- os: linux
env: VERSION=1.0 VARIANT=buster ARCH=
- os: linux
Expand Down
73 changes: 0 additions & 73 deletions 1.3-rc/buster/Dockerfile

This file was deleted.

73 changes: 0 additions & 73 deletions 1.3-rc/stretch/Dockerfile

This file was deleted.

40 changes: 0 additions & 40 deletions 1.3-rc/windows/windowsservercore-1803/Dockerfile

This file was deleted.

40 changes: 0 additions & 40 deletions 1.3-rc/windows/windowsservercore-ltsc2016/Dockerfile

This file was deleted.

12 changes: 6 additions & 6 deletions 1.2/buster/Dockerfile → 1.3/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV PATH $JULIA_PATH/bin:$PATH
ENV JULIA_GPG 3673DF529D9049477F76B37566E3C7DC03D6E495

# https://julialang.org/downloads/
ENV JULIA_VERSION 1.2.0
ENV JULIA_VERSION 1.3.0

RUN set -eux; \
\
Expand All @@ -32,18 +32,18 @@ RUN set -eux; \
fi; \
\
# https://julialang.org/downloads/#julia-command-line-version
# https://julialang-s3.julialang.org/bin/checksums/julia-1.2.0.sha256
# https://julialang-s3.julialang.org/bin/checksums/julia-1.3.0.sha256
# this "case" statement is generated via "update.sh"
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
# amd64
amd64) tarArch='x86_64'; dirArch='x64'; sha256='926ced5dec5d726ed0d2919e849ff084a320882fb67ab048385849f9483afc47' ;; \
amd64) tarArch='x86_64'; dirArch='x64'; sha256='9ec9e8076f65bef9ba1fb3c58037743c5abb3b53d845b827e44a37e7bcacffe8' ;; \
# arm32v7
armhf) tarArch='armv7l'; dirArch='armv7l'; sha256='71d24159f4f08a327c0a2ba8291654121d5f672422cd89bed3966f8df74d33dc' ;; \
armhf) tarArch='armv7l'; dirArch='armv7l'; sha256='7739a318f371250faf10befd5636008fbb84992cc90ee88b3a753b1ad408ad7c' ;; \
# arm64v8
arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='7dab9aa4a320aedb7a4b68c582f9edd434f58867132cb8c6349df25111c3324a' ;; \
arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='8557c86cb4f65e8d8c2b1da376e759548cb35942a63820a6d20bc1448c45ec1b' ;; \
# i386
i386) tarArch='i686'; dirArch='x86'; sha256='82f68aed874817cc8f8b49e4f9c391c7911863603528b473900ba51f9067fadd' ;; \
i386) tarArch='i686'; dirArch='x86'; sha256='e43339e72b2e71f8df343e6f542bf3a48cbbf7e9c135b076d5d651d9153615c9' ;; \
*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding Julia binary release"; exit 1 ;; \
esac; \
\
Expand Down
12 changes: 6 additions & 6 deletions 1.2/stretch/Dockerfile → 1.3/stretch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV PATH $JULIA_PATH/bin:$PATH
ENV JULIA_GPG 3673DF529D9049477F76B37566E3C7DC03D6E495

# https://julialang.org/downloads/
ENV JULIA_VERSION 1.2.0
ENV JULIA_VERSION 1.3.0

RUN set -eux; \
\
Expand All @@ -32,18 +32,18 @@ RUN set -eux; \
fi; \
\
# https://julialang.org/downloads/#julia-command-line-version
# https://julialang-s3.julialang.org/bin/checksums/julia-1.2.0.sha256
# https://julialang-s3.julialang.org/bin/checksums/julia-1.3.0.sha256
# this "case" statement is generated via "update.sh"
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
# amd64
amd64) tarArch='x86_64'; dirArch='x64'; sha256='926ced5dec5d726ed0d2919e849ff084a320882fb67ab048385849f9483afc47' ;; \
amd64) tarArch='x86_64'; dirArch='x64'; sha256='9ec9e8076f65bef9ba1fb3c58037743c5abb3b53d845b827e44a37e7bcacffe8' ;; \
# arm32v7
armhf) tarArch='armv7l'; dirArch='armv7l'; sha256='71d24159f4f08a327c0a2ba8291654121d5f672422cd89bed3966f8df74d33dc' ;; \
armhf) tarArch='armv7l'; dirArch='armv7l'; sha256='7739a318f371250faf10befd5636008fbb84992cc90ee88b3a753b1ad408ad7c' ;; \
# arm64v8
arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='7dab9aa4a320aedb7a4b68c582f9edd434f58867132cb8c6349df25111c3324a' ;; \
arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='8557c86cb4f65e8d8c2b1da376e759548cb35942a63820a6d20bc1448c45ec1b' ;; \
# i386
i386) tarArch='i686'; dirArch='x86'; sha256='82f68aed874817cc8f8b49e4f9c391c7911863603528b473900ba51f9067fadd' ;; \
i386) tarArch='i686'; dirArch='x86'; sha256='e43339e72b2e71f8df343e6f542bf3a48cbbf7e9c135b076d5d651d9153615c9' ;; \
*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding Julia binary release"; exit 1 ;; \
esac; \
\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM microsoft/windowsservercore:1803
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ENV JULIA_VERSION 1.2.0
ENV JULIA_SHA256 7b122501ccce7b66d5e9e7e93fe29c3be8479f9bbdf2b0c9daa7e5572341da7a
ENV JULIA_VERSION 1.3.0
ENV JULIA_SHA256 35af4b93188b2404a78026b583c7f010ecb17df2eabb9fc32de4737de28f31d5

RUN $url = ('https://julialang-s3.julialang.org/bin/winnt/x64/{1}/julia-{0}-win64.exe' -f $env:JULIA_VERSION, ($env:JULIA_VERSION.Split('.')[0..1] -Join '.')); \
Write-Host ('Downloading {0} ...' -f $url); \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM microsoft/windowsservercore:ltsc2016
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ENV JULIA_VERSION 1.2.0
ENV JULIA_SHA256 7b122501ccce7b66d5e9e7e93fe29c3be8479f9bbdf2b0c9daa7e5572341da7a
ENV JULIA_VERSION 1.3.0
ENV JULIA_SHA256 35af4b93188b2404a78026b583c7f010ecb17df2eabb9fc32de4737de28f31d5

RUN $url = ('https://julialang-s3.julialang.org/bin/winnt/x64/{1}/julia-{0}-win64.exe' -f $env:JULIA_VERSION, ($env:JULIA_VERSION.Split('.')[0..1] -Join '.')); \
Write-Host ('Downloading {0} ...' -f $url); \
Expand Down
2 changes: 1 addition & 1 deletion generate-stackbrew-library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -Eeuo pipefail

declare -A aliases=(
[1.2]='1 latest'
[1.3]='1 latest'
)
defaultDebianVariant='buster'

Expand Down

0 comments on commit 25dd704

Please sign in to comment.