Merge pull request #168 from slaclab/pre-release

Release Candidate v3.8.2
slaclab · Sep 4, 2024 · 26d360e · 26d360e
2 parents db6464c + 8a628f4
commit 26d360e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 85 deletions.
diff --git a/.github/workflows/timing_ci.yml b/.github/workflows/timing_ci.yml
@@ -60,89 +60,24 @@ jobs:
           github_token: ${{ secrets.GH_TOKEN }}
           publish_dir: doxygen/html
 
+# ----------------------------------------------------------------------------
+
   gen_release:
-    name: Generate Release
-    runs-on: ubuntu-20.04
     needs: [test_and_document]
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - name: Get Image Information
-        id: get_image_info
-        run: |
-          echo ::set-output name=tag::`git describe --tags`
+    uses: slaclab/ruckus/.github/workflows/gen_release.yml@main
+    with:
+      version: '1.0.0'
+    secrets:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
-      - name: Get Ruckus
-        run: |
-          git clone https://github.com/slaclab/ruckus.git
-          python -m pip install --upgrade pip
-          pip install -r ruckus/scripts/pip_requirements.txt
-
-      - name: Gen Release
-        env:
-          TRAVIS_REPO_SLUG: ${{ github.repository }}
-          TRAVIS_TAG: ${{ steps.get_image_info.outputs.tag }}
-          GH_REPO_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          python ruckus/scripts/releaseGen.py
+# ----------------------------------------------------------------------------
 
-  conda_build:
-    name: Anaconda Build
+  conda_build_lib:
     needs: [test_and_document]
-    if: startsWith(github.ref, 'refs/tags/')
-    strategy:
-      matrix:
-        os:
-          - ubuntu-20.04
-    runs-on: ${{ matrix.os }}
-    steps:
-
-      # This step checks out a copy of your repository.
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - name: Setup anaconda
-        env:
-          OS_NAME: ${{ matrix.os }}
-        run: |
-          cd ${HOME}
-          wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-          bash miniconda.sh -b -p ${HOME}/miniconda
-          export PATH="${HOME}/miniconda/bin:$PATH"
-          source ${HOME}/miniconda/etc/profile.d/conda.sh
-          conda config --set always_yes yes
-          conda config --set channel_priority strict
-          conda install -n base conda-libmamba-solver
-          conda config --set solver libmamba
-          conda install conda-build anaconda-client conda-verify
-          conda update -q conda conda-build
-          conda update --all
+    uses: slaclab/ruckus/.github/workflows/conda_build_lib.yml@main
+    with:
+      version: '1.0.0'
+    secrets:
+      CONDA_UPLOAD_TOKEN_TAG: ${{ secrets.CONDA_UPLOAD_TOKEN_TAG }}
 
-      - name: Get Image Information
-        id: get_image_info
-        env:
-          CONDA_UPLOAD_TOKEN_TAG: ${{ secrets.CONDA_UPLOAD_TOKEN_TAG }}
-          OS_NAME: ${{ matrix.os }}
-        run: |
-          echo ::set-output name=token::$CONDA_UPLOAD_TOKEN_TAG
-          echo ::set-output name=os::linux-64
-
-      - name: Build And Upload
-        run: |
-          export PATH="${HOME}/miniconda/bin:$PATH"
-          source ${HOME}/miniconda/etc/profile.d/conda.sh
-          conda build --debug conda-recipe --output-folder bld-dir -c tidair-tag -c tidair-packages -c conda-forge
-          anaconda -t ${{ steps.get_image_info.outputs.token }} upload --force bld-dir/noarch/*.tar.bz2
+# ----------------------------------------------------------------------------
diff --git a/LCLS-II/core/rtl/ClockTime_186MHz.vhd b/LCLS-II/core/rtl/ClockTime_186MHz.vhd
@@ -22,7 +22,7 @@ use UNISIM.VCOMPONENTS.ALL;
 library surf;
 use surf.StdRtlPkg.all;
 
-entity ClockTime is
+entity ClockTime_186MHz is
    generic (
       TPD_G    : time    := 1 ns);
    port (
@@ -37,10 +37,10 @@ entity ClockTime is
       wrEnB              : in  sl;
       dataO              : out slv(63 downto 0)
       );
-end ClockTime;
+end ClockTime_186MHz;
 
 -- Define architecture for top level module
-architecture ClockTime_186MHz of ClockTime is
+architecture rtl of ClockTime_186MHz is
 
   constant remainder : slv( 4 downto 0)  := slv(conv_unsigned( 5,5));
   constant divisor   : slv( 4 downto 0)  := slv(conv_unsigned(13,5));
@@ -101,4 +101,4 @@ begin
 
   dataO <= dataB;
 
-end ClockTime_186MHz;
+end rtl;
diff --git a/LCLS-II/core/rtl/TimingStreamTx.vhd b/LCLS-II/core/rtl/TimingStreamTx.vhd
@@ -94,7 +94,7 @@ begin
         v.ecodData   := K_COM_C;
         v.dataK      := "01";
       end if;
-      
+
       case (r.state) is
         when IDLE_S =>
           v.wordCount := (others=>'0');