diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 45ced4b..e21c991 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -17,12 +17,24 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - + + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.BBSD_IMAGE }} + - name: Build the Docker image id: build-bbsd uses: docker/build-push-action@v5 @@ -31,5 +43,7 @@ jobs: context: . file: Dockerfile/dockerfile.bbsd tags: | - ${{ env.BBSD_IMAGE }}:dev + ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha # Pull cache from GitHub Actions cache + cache-to: type=gha,mode=max # Push cache to GitHub Actions cache diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 5041263..5121ff3 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -42,6 +42,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.BBSD_IMAGE }} + - name: Build and push Docker image id: push-bbsd uses: docker/build-push-action@v5 @@ -53,4 +59,7 @@ jobs: tags: | ${{ env.BBSD_IMAGE }}:${{ github.ref_name }} ${{ env.BBSD_IMAGE }}:latest + ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha # Pull cache from GitHub Actions cache + cache-to: type=gha,mode=max # Push cache to GitHub Actions cache diff --git a/configure.ac b/configure.ac index a30bb9a..ee768f4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([lbbs],[1.7.4]) +AC_INIT([lbbs],[1.7.5]) AC_CONFIG_SRCDIR([src/]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIRS([m4]) diff --git a/src/lml.c b/src/lml.c index e8f5bd1..f309146 100644 --- a/src/lml.c +++ b/src/lml.c @@ -409,6 +409,10 @@ int lml_render(const char *str_in, char *str_out, int buf_len, int width, int qu CHECK_AND_APPEND_OUTPUT(str_out, buf_len, j, tab_spaces, tab_width, line_width); continue; } + else if (!quote_mode && str_in[i] == '\033') + { + continue; // Skip control characters while not in quote mode + } if (!lml_tag_disabled && str_in[i] == '[') { diff --git a/src/section_list_loader.c b/src/section_list_loader.c index e7055fc..7566d55 100644 --- a/src/section_list_loader.c +++ b/src/section_list_loader.c @@ -630,7 +630,7 @@ int apply_article_op_log_from_db(int op_count_limit) p_section->sid, p_article->aid); } break; - case 'Z': // Set article as trnasship + case 'Z': // Set article as transship p_article->transship = 1; break; default: