Skip to content
This repository has been archived by the owner on Sep 13, 2023. It is now read-only.

Commit

Permalink
Update versions (#5)
Browse files Browse the repository at this point in the history
* Update versions

* Reverted alpine version upgrade

* Use correct CDKTF version

* Fixed action

* Fixed tests

* Updated versions
  • Loading branch information
pcasteran authored Dec 4, 2022
1 parent 5474251 commit ab57b61
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 14 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
env:
IMAGE_NAME: "cdktf-bundle"
IMAGE_PLATFORMS: "linux/amd64,linux/arm64"
CDKTF_VERSION: "0.13.3"

jobs:

Expand All @@ -36,6 +35,18 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use CDKTF version from tag
if: ${{ startsWith(github.event.ref, 'refs/tags/') }}
run: |
TAG_VERSION=$(echo "${{ github.event.ref }}" | sed -n 's/.*\/v\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')
echo "CDKTF_VERSION=${TAG_VERSION}" >> "${GITHUB_ENV}"
- name: Use CDKTF version from Dockerfile
if: ${{ !startsWith(github.event.ref, 'refs/tags/') }}
run: |
DOCKERFILE_VERSION=$(sed -n 's/^.*CDKTF_VERSION=\"\(.*\)\"$/\1/p' Dockerfile)
echo "CDKTF_VERSION=${DOCKERFILE_VERSION}" >> "${GITHUB_ENV}"
- name: Set up Docker
if: ${{ startsWith(matrix.platform.runner, 'macos') }}
run: |
Expand Down
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
ARG BASE="python"
ARG PYTHON_BASE_VERSION="3.10-alpine3.16"
ARG GO_BASE_VERSION="1.19-alpine3.16"
ARG PYTHON_BASE_VERSION="3.11-alpine3.17"
ARG GO_BASE_VERSION="1.19-alpine3.17"

ARG PIPENV_VERSION="2022.11.11"
ARG POETRY_VERSION="1.1.13-r2"
ARG PIPENV_VERSION="2022.11.30"
ARG POETRY_VERSION="1.2.2-r0"

ARG NODE_VERSION="18.9.1-r0"
ARG NPM_VERSION="8.10.0-r0"
ARG NODE_VERSION="18.12.1-r0"
ARG NPM_VERSION="9.1.2-r0"

ARG TERRAFORM_VERSION="1.3.6"
ARG CDKTF_VERSION="0.13.3"
ARG CDKTF_VERSION="0.14.1"

##

Expand Down Expand Up @@ -41,7 +41,7 @@ ARG CDKTF_VERSION

# Install node and npm.
RUN apk add --no-cache \
nodejs-current=${NODE_VERSION} \
nodejs=${NODE_VERSION} \
npm=${NPM_VERSION}

# Install Terraform.
Expand Down
8 changes: 4 additions & 4 deletions test/go/main_full_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package main
import (
"github.com/aws/constructs-go/constructs/v10"
"github.com/aws/jsii-runtime-go"
localFile "github.com/cdktf/cdktf-provider-local-go/local/v3/file"
localProvider "github.com/cdktf/cdktf-provider-local-go/local/v3/provider"
randomProvider "github.com/cdktf/cdktf-provider-random-go/random/v3/provider"
"github.com/cdktf/cdktf-provider-random-go/random/v3/stringresource"
localFile "github.com/cdktf/cdktf-provider-local-go/local/v4/file"
localProvider "github.com/cdktf/cdktf-provider-local-go/local/v4/provider"
randomProvider "github.com/cdktf/cdktf-provider-random-go/random/v4/provider"
"github.com/cdktf/cdktf-provider-random-go/random/v4/stringresource"
"github.com/hashicorp/terraform-cdk-go/cdktf"
"os"
"path/filepath"
Expand Down
2 changes: 1 addition & 1 deletion test/python/test.bats
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ initialize_project() {
assert_file_contains "poetry.lock" '^name = "cdktf"$'

# Install the `random` provider.
run cdktf_bundle poetry add cdktf-cdktf-provider-random==3.0.11
run cdktf_bundle poetry add cdktf-cdktf-provider-random
assert_success
assert_file_contains "pyproject.toml" '^cdktf-cdktf-provider-random = ".*"'
assert_file_contains "poetry.lock" '^name = "cdktf-cdktf-provider-random"$'
Expand Down

0 comments on commit ab57b61

Please sign in to comment.