.github/workflows/ci: Push docker image

Author: AlexisMontagne

.dockerignore

@@ -1 +1,3 @@
 .git/
+CMakeFiles/
+CMakeCache.txt

.github/workflows/ci.yml

@@ -73,6 +73,20 @@ jobs:
       - name: tar types
         run: |
           tar -cvf dist/types.tar types
+      - name: move thrift-docker
+        run: |
+          cp contrib/thrift-docker dist
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build docker container
+        uses: upfluence/actions/build-docker@master
+        with:
+          version: ${{ needs.compute-version.outputs.version }}
+          registries: ghcr.io
       - name: Create release
         uses: upfluence/actions/create-github-release@master
         with:

.gitignore

@@ -278,3 +278,5 @@ test-driver
 /CPack*.cmake
 /compile_commands.json
 /install_manifest.txt
+**/*.cmake
+**/CMakeFiles

Dockerfile

@@ -25,10 +25,11 @@
 #
 # TODO: push to apache/thrift-compiler instead of thrift/thrift-compiler
 
-FROM debian:jessie
+FROM debian:latest
 MAINTAINER Apache Thrift <dev@thrift.apache.org>
 
 ENV DEBIAN_FRONTEND noninteractive
+ARG SEMVER_VERSION=v0.0.0
 
 ADD . /thrift
 
@@ -43,19 +44,22 @@ RUN buildDeps=" \
     apt-get update && apt-get install -y --no-install-recommends $buildDeps \
     && mkdir /tmp/cmake-build && cd /tmp/cmake-build \
     && cmake \
+       -DTHRIFT_VERSION=${SEMVER_VERSION#v}-upfluence \
        -DBUILD_COMPILER=ON \
        -DBUILD_LIBRARIES=OFF \
        -DBUILD_TESTING=OFF \
        -DBUILD_EXAMPLES=OFF \
        /thrift \
     && cmake --build . --config Release \
     && make install \
-    && curl -k -sSL "https://storage.googleapis.com/golang/go1.5.2.linux-amd64.tar.gz" -o /tmp/go.tar.gz \
+    && curl -k -sSL "https://storage.googleapis.com/golang/go1.23.2.linux-amd64.tar.gz" -o /tmp/go.tar.gz \
     && tar xzf /tmp/go.tar.gz -C /tmp \
     && cp /tmp/go/bin/gofmt /usr/bin/gofmt \
     && apt-get purge -y --auto-remove $buildDeps \
     && apt-get clean \
     && rm -rf /tmp/* \
     && rm -rf /var/lib/apt/lists/*
 
+WORKDIR /data
+
 ENTRYPOINT ["thrift"]

contrib/thrift-docker

@@ -0,0 +1,3 @@
+TAG=${TAG:-"latest"}
+
+exec docker run --pull always -v "${PWD}:/data" --rm -it ghcr.io/upfluence/thrift:${TAG} $@

lib/Makefile.am

@@ -94,4 +94,10 @@ EXTRA_DIST = \
 
 precross-%:
 	$(MAKE) -C $* precross
+
 precross: precross-nodejs precross-csharp precross-java
+
+generate-types-%:
+	$(MAKE) -C $* generate-types
+
+generate-types: generate-types-go generate-types-rb generate-types-cpp

lib/cpp/Makefile.am

@@ -271,3 +271,13 @@ EXTRA_DIST = \
 
 style-local:
 	$(CPPSTYLE_CMD)
+
+TYPE_FILES = ../../types/*.thrift ../../types/known/*.thrift
+
+$(TYPE_FILES):
+	mkdir -p src/thrift/$(patsubst ../../%,%,$(dir $@))
+	$(THRIFT) -gen cpp --out src/thrift/$(patsubst ../../%,%,$(dir $@)) $@
+
+generate-types: $(TYPE_FILES)
+
+.PHONY: generate-types $(TYPE_FILES)