Add GitHub Actions support [FS-1505]

.devcontainer/devcontainer.json

@@ -10,6 +10,7 @@
  "settings": {},
  "extensions": [
  "davidanson.vscode-markdownlint",
+ "github.vscode-github-actions",
  "ms-azuretools.vscode-docker",
  "ms-vscode.cpptools-extension-pack",
  "ms-vscode.makefile-tools",
@@ -20,13 +21,19 @@
  "settings": {},
  "extensions": [
  "davidanson.vscode-markdownlint",
+ "github.vscode-github-actions",
  "ms-azuretools.vscode-docker",
  "ms-vscode.cpptools-extension-pack",
  "ms-vscode.makefile-tools",
  "redhat.vscode-yaml"
  ]
  }
  },
+ // Bind mounting ~/.netrc allows use of the GitHub CLI (`gh`) by running
+ // `export GH_TOKEN=$(awk '{print $6}' ~/.netrc)` within the dev container.
+ "mounts": [
+ "type=bind,source=${localEnv:HOME}/.netrc,target=/home/vscode/.netrc,readonly"
+ ],
  "containerUser": "vscode",
  "updateRemoteUserUID": true
 }

.dockerignore

@@ -5,8 +5,6 @@
 .git/
 .gitignore
 .vscode/
-CHANNEL
-LATEST_RPM
 README.md
 VERSION
 cache/

.github/workflows/build.yml

@@ -0,0 +1,95 @@
+name: Build everything
+on:
+ - push
+env:
+ REGISTRY: ghcr.io
+defaults:
+ run:
+ shell: bash
+ # specifying `bash` here ensures `set -eo pipefail` is active
+jobs:
+ build-everything:
+ runs-on: ubuntu-latest
+ permissions:
+ # contents:write allows creating a GitHub Release.
+ # packages:write allows publishing an image to GitHub Packages.
+ contents: write
+ packages: write
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v4
+ with:
+ # autotag requires a reasonably complete git history.
+ fetch-depth: 0
+ - name: Build fusedav-dev image
+ run: docker build --progress plain --target dev -t fusedav-dev .
+ - name: Install autotag
+ run: |
+ curl -fsSL https://github.com/pantheon-systems/autotag/releases/latest/download/autotag_linux_amd64 \
+ -o /usr/local/bin/autotag
+ chmod 0755 /usr/local/bin/autotag
+ - name: Generate new version strings and tag(s)
+ env:
+ IMAGE_NAME: ${{ github.repository }}
+ run: |
+ echo "new-version.sh:"
+ scripts/compute-version.sh | tee new-version.sh
+ - name: Build/tag fusedav image
+ run: |
+ echo START build target extract
+ docker build --progress plain --target extract . --output extract
+ echo DONE build target extract
+ echo
+ echo START build final image
+ . new-version.sh
+ # Use older "maintainer" label instead of "org.opencontainers.image.maintainer"
+ # to overwrite the docker.io/library/fedora:28 value.
+ docker build --progress plain --target runtime \
+ --label "[email protected]" \
+ --label "org.opencontainers.image.description=FUSE-based DAV client with extensions for performance" \
+ --label "org.opencontainers.image.licenses=GPLv2" \
+ --label "org.opencontainers.image.source=https://github.com/pantheon-systems/fusedav" \
+ --label "org.opencontainers.image.vendor=Pantheon Systems, Inc." \
+ --label "org.opencontainers.image.version=${SEMVER}" \
+ -t fusedav .
+ echo DONE build final image
+ for tag in ${IMAGE_TAGS[@]}; do
+ echo "tag image as ${tag}"
+ docker tag fusedav $tag
+ done
+ - name: Log in to GitHub Container Registry
+ uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+ with:
+ registry: ${{ env.REGISTRY }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Push final image/tag(s) to container registry
+ run: |
+ . new-version.sh
+ for tag in ${IMAGE_TAGS[@]}; do
+ echo "push ${tag}"
+ docker push $tag
+ done
+ - name: Create (pre-release) GitHub release
+ env:
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: |
+ . new-version.sh
+ # If NOT master, create a pre-release.
+ # Note that GitHub converts the tilde (`~`) which indicates a pre-release
+ # RPM version to a period (`.`) in the filename. This should not affect
+ # RPM version comparison operations.
+ echo "Create pre-release release:"
+ gh release create $GITHUB_RELEASE_NAME -p --generate-notes --target $GITHUB_REF_NAME
+ . scripts/upload-gh-assets.sh
+ if: github.ref != 'refs/heads/master'
+ - name: Create GitHub release
+ env:
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: |
+ . new-version.sh
+ # Iff master, create a regular release.
+ echo "Create regular release:"
+ gh release create $GITHUB_RELEASE_NAME --generate-notes
+ . scripts/upload-gh-assets.sh
+ if: github.ref == 'refs/heads/master'

.gitignore

@@ -23,8 +23,6 @@
 /tests/readwhatwaswritten
 /tests/rename
 /tests/trunc
-CHANNEL
-LATEST_RPM
 Makefile.in
 VERSION
 _trial_temp*

Dockerfile

@@ -14,12 +14,6 @@
 #
 # runtime is the final runtime image.
 #
-# To build image locally:
-# docker build --progress plain --build-arg CIRCLE_SHA1=$(git rev-parse --short HEAD) -t fusedav .
-#
-# To compile/build and extract the RPM into the `extract` directory:
-# docker build --progress plain --build-arg GITHUB_SHA=$(git rev-parse --short HEAD) --target extract -t fusedav-extract . --output=extract
-#
 FROM docker.io/library/fedora:28 AS base
 
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
@@ -50,6 +44,7 @@ FROM base AS dev
 
 RUN \
  dnf install -y \
+ 'dnf-command(config-manager)' \
  autoconf \
  automake \
  bind-utils \
@@ -66,51 +61,35 @@ RUN \
  make \
  procps-ng \
  rpm-build \
- ruby-devel \
  strace \
  systemd-devel \
  tcpdump \
  uriparser-devel \
  zlib-devel \
+ && dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo \
+ && dnf install -y gh \
  && dnf clean all \
  && rm -rf /var/cache/dnf \
- && gem install fpm --no-rdoc --no-ri \
- && gem install package_cloud -v 0.2.45 \
  && curl -fsSL https://github.com/pantheon-systems/autotag/releases/latest/download/autotag_linux_amd64 \
  -o /usr/local/bin/autotag \
  && chmod 0755 /usr/local/bin/autotag
 
 # Installing autotag above makes it available within a dev container.
 # When building via CI/CD, autotag is installed/called elsewhere.
 
+# Installing gh above makes it available within a dev container.
+# When building via GitHub Actions, gh is installed/called elsewhere.
+
 USER vscode
 
 ########################################
 
 FROM dev AS compile
 
+# new-version.sh MUST be created before we get here
 COPY . /build
 WORKDIR /build
 
-ARG CIRCLE_BRANCH="unknown"
-ARG CIRCLE_BUILD_NUM=""
-ARG CIRCLE_SHA1=0000000
-
-# CHANNEL is always `release` now.
-# Historically, CHANNEL could be: dev, stage, yolo, release
-ARG CHANNEL=release
-
-# Set PACKAGECLOUD_REPO to `internal` or `internal-staging` to publish RPM.
-ARG PACKAGECLOUD_REPO=""
-
-# RPM_VERSION is set here for local/direct `docker build` use; CircleCI builds
-# will set their own value.
-ARG RPM_VERSION="0.0.0+0"
-
-# SEMVER is set here for local/direct `docker build` use; CircleCI builds
-# will set their own value.
-ARG SEMVER="0.0.0-local"
-
 # Using explicit USER instructions instead of sudo to satisfy Guardrails.
 USER root
 
@@ -120,27 +99,28 @@ RUN \
 USER vscode
 
 RUN \
- echo "${RPM_VERSION}" > VERSION \
- && scripts/build-rpm.sh "${CHANNEL}" \
- && if [ -n "${PACKAGECLOUD_REPO}" ] ; then \
- echo SKIPPING scripts/push_packagecloud.sh ; \
- else \
- echo "NOT pushing RPM to Packagecloud as this is a pre-release build" ; \
- fi
+ scripts/build-rpm.sh
 
 ########################################
 
 FROM scratch AS extract
 
-COPY --from=compile /build/pkg pkg
+COPY --from=compile /home/vscode/rpmbuild/RPMS RPMS
+COPY --from=compile /home/vscode/rpmbuild/SRPMS SRPMS
+COPY --from=compile /build/LATEST-RPM-VER-REL LATEST-RPM-VER-REL
 
 ########################################
 
 FROM base AS runtime
 
-ARG CHANNEL=release
+COPY --from=compile \
+ /build/LATEST-RPM-VER-REL \
+ /home/vscode/rpmbuild/RPMS/x86_64/fusedav-*.rpm \
+ /tmp/
 
-COPY --from=compile /build/src/fusedav "/opt/pantheon/fusedav-${CHANNEL}/fusedav-${CHANNEL}"
-COPY scripts/exec_wrapper/mount.fusedav_chan "/usr/sbin/mount.fusedav-${CHANNEL}"
+# BEWARE: `.fc28` is the RPM release suffix normally added by rpmbuild.
+RUN \
+ LATEST=$(cat /tmp/LATEST-RPM-VER-REL) \
+ && rpm -i "/tmp/fusedav-${LATEST}.fc28.x86_64.rpm"
 
 USER fusedav